gnustep/tools-make
0
0
Fork 0
mirror of https://github.com/gnustep/tools-make.git synced 2025-05-31 01:10:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Changed GNUSTEP_BASE_INSTALL to INSTALL_ROOT_DIR

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@8663 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Nicola Pero 2001-01-17 18:46:07 +00:00
parent 032031f9f3
commit aaa9206547
5 changed files with 16 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -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> 2001-01-17 Adam Fedor <fedor@gnu.org>
* library.make (LIBRARY_OBJ_DIR): New redefinable var to specify * library.make (LIBRARY_OBJ_DIR): New redefinable var to specify

10
rpm.make
View file

@ -192,7 +192,7 @@ RPM_MAKE_LOADED=yes
# If we have been called with something like # 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 \ # GNUSTEP_INSTALLATION_DIR=/var/tmp/package-build/usr/GNUstep/Local \
# filelist=yes install # filelist=yes install
# #
@ -215,20 +215,20 @@ ifeq ($(filelist),yes)
# install - done by other GNUmakefiles - NB: must install everything inside # install - done by other GNUmakefiles - NB: must install everything inside
# GNUSTEP_INSTALLATION_DIR, or prefix all installation dirs with # GNUSTEP_INSTALLATION_DIR, or prefix all installation dirs with
# $GNUSTEP_INSTALL_BASE such as # $INSTALL_ROOT_DIR such as
# $(INSTALL_DATA) page.html $(GNUSTEP_INSTALL_BASE)/usr/local/MySoftware/ # $(INSTALL_DATA) page.html $(INSTALL_ROOT_DIR)/usr/local/MySoftware/
# instead of $(INSTALL_DATA) page.html /usr/local/MySoftware/ # instead of $(INSTALL_DATA) page.html /usr/local/MySoftware/
# Get the list of files inside GNUSTEP_INSTALL_BASE # Get the list of files inside GNUSTEP_INSTALL_BASE
after-install:: 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 \ if [ -d "$$file" ]; then \
echo "%dir $$file" > /dev/null; \ echo "%dir $$file" > /dev/null; \
else \ else \
echo "$$file" >> $(FILE_LIST); \ echo "$$file" >> $(FILE_LIST); \
fi; \ fi; \
done 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) mv file-list.tmp $(FILE_LIST)
endif # filelist == yes endif # filelist == yes

2
spec-debug-alone-rules.template
View file

@ -25,7 +25,7 @@ if [ -z "$GNUSTEP_SYSTEM_ROOT" ]; then
fi fi
make debug=yes \ make debug=yes \
GNUSTEP_INSTALL_BASE=$RPM_BUILD_ROOT \ INSTALL_ROOT_DIR=$RPM_BUILD_ROOT \
GNUSTEP_INSTALLATION_DIR=$RPM_BUILD_ROOT%{gs_install_dir} \ GNUSTEP_INSTALLATION_DIR=$RPM_BUILD_ROOT%{gs_install_dir} \
filelist=yes install filelist=yes install

4
spec-debug-rules.template
View file

@ -27,14 +27,14 @@ fi
# build the non debugging file list # build the non debugging file list
mkdir tmp-rpm-build-%{gs_name} mkdir tmp-rpm-build-%{gs_name}
make debug=no \ 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} \ GNUSTEP_INSTALLATION_DIR=`pwd`/tmp-rpm-build-%{gs_name}/%{gs_install_dir} \
filelist=yes install filelist=yes install
rm -rf tmp-rpm-build-%{gs_name} rm -rf tmp-rpm-build-%{gs_name}
# build the debugging file list # build the debugging file list
make debug=yes \ make debug=yes \
GNUSTEP_INSTALL_BASE=$RPM_BUILD_ROOT \ INSTALL_ROOT_DIR=$RPM_BUILD_ROOT \
GNUSTEP_INSTALLATION_DIR=$RPM_BUILD_ROOT%{gs_install_dir} \ GNUSTEP_INSTALLATION_DIR=$RPM_BUILD_ROOT%{gs_install_dir} \
filelist=yes install filelist=yes install

2
spec-rules.template
View file

@ -24,7 +24,7 @@ if [ -z "$GNUSTEP_SYSTEM_ROOT" ]; then
. %{gs_root}/Makefiles/GNUstep.sh . %{gs_root}/Makefiles/GNUstep.sh
fi fi
make GNUSTEP_INSTALL_BASE=$RPM_BUILD_ROOT \ make INSTALL_ROOT_DIR=$RPM_BUILD_ROOT \
GNUSTEP_INSTALLATION_DIR=$RPM_BUILD_ROOT%{gs_install_dir} \ GNUSTEP_INSTALLATION_DIR=$RPM_BUILD_ROOT%{gs_install_dir} \
filelist=yes install filelist=yes install