From aaa920654799e5502afa15c3f581e007d045c2b2 Mon Sep 17 00:00:00 2001
From: Nicola Pero <n.pero@mi.flashnet.it>
Date: Wed, 17 Jan 2001 18:46:07 +0000
Subject: [PATCH] Changed GNUSTEP_BASE_INSTALL to INSTALL_ROOT_DIR

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@8663 72102866-910b-0410-8b05-ffd578937521
---
 ChangeLog                       |  7 +++++++
 rpm.make                        | 10 +++++-----
 spec-debug-alone-rules.template |  2 +-
 spec-debug-rules.template       |  4 ++--
 spec-rules.template             |  2 +-
 5 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 442c856a..ffb5d515 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Wed Jan 17 17:19:58 2001  Nicola Pero  <nicola@brainstorm.co.uk>
+
+	* rpm.make: GNUSTEP_BASE_INSTALL changed to INSTALL_ROOT_DIR since
+	this variable is already used in gnustep-base to do the same job.
+	* spec-rules.template, spec-debug-rules.template, 
+	spec-debug-alone-rules.template: Updated for change.
+
 2001-01-17  Adam Fedor  <fedor@gnu.org>
 
 	* library.make (LIBRARY_OBJ_DIR): New redefinable var to specify
diff --git a/rpm.make b/rpm.make
index c83cddcd..3eafe800 100644
--- a/rpm.make
+++ b/rpm.make
@@ -192,7 +192,7 @@ RPM_MAKE_LOADED=yes
 
 # If we have been called with something like
 #
-# make GNUSTEP_INSTALL_BASE=/var/tmp/package-build/ \
+# make INSTALL_ROOT_DIR=/var/tmp/package-build/ \
 #      GNUSTEP_INSTALLATION_DIR=/var/tmp/package-build/usr/GNUstep/Local \
 #      filelist=yes install
 #
@@ -215,20 +215,20 @@ ifeq ($(filelist),yes)
 
   # install - done by other GNUmakefiles - NB: must install everything inside
   # GNUSTEP_INSTALLATION_DIR, or prefix all installation dirs with 
-  # $GNUSTEP_INSTALL_BASE such as 
-  # $(INSTALL_DATA) page.html $(GNUSTEP_INSTALL_BASE)/usr/local/MySoftware/
+  # $INSTALL_ROOT_DIR such as 
+  # $(INSTALL_DATA) page.html $(INSTALL_ROOT_DIR)/usr/local/MySoftware/
   # instead of $(INSTALL_DATA) page.html /usr/local/MySoftware/
 
   # Get the list of files inside GNUSTEP_INSTALL_BASE
   after-install::
-	for file in `$(TAR) Pcf - $(GNUSTEP_INSTALL_BASE) | $(TAR) t`; do \
+	for file in `$(TAR) Pcf - $(INSTALL_ROOT_DIR) | $(TAR) t`; do \
 	  if [ -d "$$file" ]; then                                \
 	    echo "%dir $$file" > /dev/null;                       \
 	  else                                                    \
 	    echo "$$file" >> $(FILE_LIST);                        \
 	  fi;                                                     \
 	done                                                    
-	sed -e "s|$(GNUSTEP_INSTALL_BASE)||" $(FILE_LIST) > file-list.tmp
+	sed -e "s|$(INSTALL_ROOT_DIR)||" $(FILE_LIST) > file-list.tmp
 	mv file-list.tmp $(FILE_LIST)                             
 
 endif # filelist == yes
diff --git a/spec-debug-alone-rules.template b/spec-debug-alone-rules.template
index ce621af6..42e75b49 100644
--- a/spec-debug-alone-rules.template
+++ b/spec-debug-alone-rules.template
@@ -25,7 +25,7 @@ if [ -z "$GNUSTEP_SYSTEM_ROOT" ]; then
 fi
 
 make debug=yes \
-  GNUSTEP_INSTALL_BASE=$RPM_BUILD_ROOT \
+  INSTALL_ROOT_DIR=$RPM_BUILD_ROOT \
   GNUSTEP_INSTALLATION_DIR=$RPM_BUILD_ROOT%{gs_install_dir} \
   filelist=yes install
 
diff --git a/spec-debug-rules.template b/spec-debug-rules.template
index cf9d16b9..24fcfc60 100644
--- a/spec-debug-rules.template
+++ b/spec-debug-rules.template
@@ -27,14 +27,14 @@ fi
 # build the non debugging file list
 mkdir tmp-rpm-build-%{gs_name}
 make debug=no \
-  GNUSTEP_INSTALL_BASE=`pwd`/tmp-rpm-build-%{gs_name}/ \
+  INSTALL_ROOT_DIR=`pwd`/tmp-rpm-build-%{gs_name}/ \
   GNUSTEP_INSTALLATION_DIR=`pwd`/tmp-rpm-build-%{gs_name}/%{gs_install_dir} \
   filelist=yes install
 rm -rf tmp-rpm-build-%{gs_name}
 
 # build the debugging file list
 make debug=yes \
-  GNUSTEP_INSTALL_BASE=$RPM_BUILD_ROOT \
+  INSTALL_ROOT_DIR=$RPM_BUILD_ROOT \
   GNUSTEP_INSTALLATION_DIR=$RPM_BUILD_ROOT%{gs_install_dir} \
   filelist=yes install
 
diff --git a/spec-rules.template b/spec-rules.template
index 6450009e..4fe8cfcb 100644
--- a/spec-rules.template
+++ b/spec-rules.template
@@ -24,7 +24,7 @@ if [ -z "$GNUSTEP_SYSTEM_ROOT" ]; then
   . %{gs_root}/Makefiles/GNUstep.sh 
 fi
 
-make GNUSTEP_INSTALL_BASE=$RPM_BUILD_ROOT \
+make INSTALL_ROOT_DIR=$RPM_BUILD_ROOT \
   GNUSTEP_INSTALLATION_DIR=$RPM_BUILD_ROOT%{gs_install_dir} \
   filelist=yes install