From ccd9a1f372389e9f4e26a93c06175bd268ec8e70 Mon Sep 17 00:00:00 2001
From: Nicola Pero <n.pero@mi.flashnet.it>
Date: Wed, 12 Dec 2001 19:18:22 +0000
Subject: [PATCH] Moved code concerning INSTALL_AS_USER and INSTALL_AS_GROUP
 from common.make to rules.make so that they can be defined in
 GNUmakefile.premable

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@11731 72102866-910b-0410-8b05-ffd578937521
---
 common.make | 50 --------------------------------------------------
 rules.make  | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 50 insertions(+), 50 deletions(-)

diff --git a/common.make b/common.make
index 1738c0e9..f480d31a 100644
--- a/common.make
+++ b/common.make
@@ -533,56 +533,6 @@ ifeq ($(JAVADOC),)
   JAVADOC = $(JAVA_HOME)/bin/javadoc
 endif
 
-#
-# Prepare the arguments to install to set user/group of installed files
-#
-INSTALL_AS = 
-
-ifneq ($(INSTALL_AS_USER),)
-INSTALL_AS += -o $(INSTALL_AS_USER)
-endif
-
-ifneq ($(INSTALL_AS_GROUP),)
-INSTALL_AS += -g $(INSTALL_AS_GROUP)
-endif
-
-# Redefine INSTALL to include these flags.  This automatically
-# redefines INSTALL_DATA and INSTALL_PROGRAM as well, because they are
-# define in terms of INSTALL.
-INSTALL += $(INSTALL_AS)
-
-# Sometimes, we install without using INSTALL - typically using tar.
-# In those cases, we run chown after having installed, in order to
-# fixup the user/group.
-
-#
-# Prepare the arguments to chown to set user/group of installed files.
-#
-ifneq ($(INSTALL_AS_GROUP),)
-CHOWN_TO = $(strip $(INSTALL_AS_USER)).$(strip $(INSTALL_AS_GROUP))
-else 
-CHOWN_TO = $(strip $(INSTALL_AS_USER))
-endif
-
-# You need to run CHOWN manually, but only if CHOWN_TO is non-empty.
-
-#
-# Pass the CHOWN_TO argument to MKINSTALLDIRS
-# All installation directories should be created using MKINSTALLDIRS
-# to make sure we set the correct user/group.  Local directories should
-# be created using MKDIRS instead because we don't want to set user/group.
-#
-ifneq ($(CHOWN_TO),)
- MKINSTALLDIRS = $(MKDIRS) -c $(CHOWN_TO)
- # Fixup the library installation commands if needed so that we change
- # ownership of the links as well
- ifeq ($(shared),yes)
-  AFTER_INSTALL_LIBRARY_CMD += ; $(AFTER_INSTALL_SHARED_LIB_CHOWN)
- endif
-else
- MKINSTALLDIRS = $(MKDIRS)
-endif
-
 endif # COMMON_MAKE_LOADED
 
 ## Local variables:
diff --git a/rules.make b/rules.make
index a05fd583..ba282e47 100644
--- a/rules.make
+++ b/rules.make
@@ -185,6 +185,56 @@ $(GNUSTEP_MAKEFILES)/$(GNUSTEP_TARGET_DIR)/config.make: ;
 
 $(GNUSTEP_MAKEFILES)/Additional/*.make: ;
 
+#
+# Prepare the arguments to install to set user/group of installed files
+#
+INSTALL_AS = 
+
+ifneq ($(INSTALL_AS_USER),)
+INSTALL_AS += -o $(INSTALL_AS_USER)
+endif
+
+ifneq ($(INSTALL_AS_GROUP),)
+INSTALL_AS += -g $(INSTALL_AS_GROUP)
+endif
+
+# Redefine INSTALL to include these flags.  This automatically
+# redefines INSTALL_DATA and INSTALL_PROGRAM as well, because they are
+# define in terms of INSTALL.
+INSTALL += $(INSTALL_AS)
+
+# Sometimes, we install without using INSTALL - typically using tar.
+# In those cases, we run chown after having installed, in order to
+# fixup the user/group.
+
+#
+# Prepare the arguments to chown to set user/group of installed files.
+#
+ifneq ($(INSTALL_AS_GROUP),)
+CHOWN_TO = $(strip $(INSTALL_AS_USER)).$(strip $(INSTALL_AS_GROUP))
+else 
+CHOWN_TO = $(strip $(INSTALL_AS_USER))
+endif
+
+# You need to run CHOWN manually, but only if CHOWN_TO is non-empty.
+
+#
+# Pass the CHOWN_TO argument to MKINSTALLDIRS
+# All installation directories should be created using MKINSTALLDIRS
+# to make sure we set the correct user/group.  Local directories should
+# be created using MKDIRS instead because we don't want to set user/group.
+#
+ifneq ($(CHOWN_TO),)
+ MKINSTALLDIRS = $(MKDIRS) -c $(CHOWN_TO)
+ # Fixup the library installation commands if needed so that we change
+ # ownership of the links as well
+ ifeq ($(shared),yes)
+  AFTER_INSTALL_LIBRARY_CMD += ; $(AFTER_INSTALL_SHARED_LIB_CHOWN)
+ endif
+else
+ MKINSTALLDIRS = $(MKDIRS)
+endif
+
 #
 # If this is part of the compilation of a framework,
 # add -I[../../../etc]derived_src so that the code can include