mirror of
https://github.com/gnustep/tools-make.git
synced 2025-04-23 22:33:28 +00:00
Use DESTDIR instead of special_prefix to comply with GNU Coding Standards and standard packaging conventions
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@23643 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
454643a13d
commit
0f912aaf51
3 changed files with 25 additions and 8 deletions
11
ChangeLog
11
ChangeLog
|
@ -1,3 +1,14 @@
|
|||
2006-09-28 Nicola Pero <nicola.pero@meta-innovation.com>
|
||||
|
||||
'make install special_prefix=xxx' should be replaced by 'make
|
||||
install DESTDIR=xxx'.
|
||||
* GNUmakefile.in (DESTDIR): New variable that replaces
|
||||
special_prefix and complies with the GNU Coding Standards.
|
||||
(special_prefix): If a special_prefix is specified, use it
|
||||
but emit a warning that it is now deprecated.
|
||||
* gnustep-make.spec.in: Updated to use DESTDIR instead of
|
||||
special_prefix.
|
||||
|
||||
2006-09-25 Nicola Pero <nicola.pero@meta-innovation.com>
|
||||
|
||||
* Master/source-distribution.make: Use TAR everywhere instead of
|
||||
|
|
|
@ -31,15 +31,21 @@ include config.make
|
|||
|
||||
# To install everything inside a temporary directory (say as part of
|
||||
# building a binary package - deb or rpm), use something like `make
|
||||
# install special_prefix=/var/tmp/gnustep-make'
|
||||
special_prefix =
|
||||
# install DESTDIR=/var/tmp/gnustep-make'
|
||||
DESTDIR =
|
||||
|
||||
GNUSTEP_CONFIG_FILE = $(special_prefix)@GNUSTEP_CONFIG_FILE@
|
||||
# 'special_prefix' is an old alias for DESTDIR.
|
||||
ifneq ($(special_prefix),)
|
||||
$(warning "WARNING: special_prefix is deprecated. Please use DESTDIR instead")
|
||||
DESTDIR = $(special_prefix)
|
||||
endif
|
||||
|
||||
GNUSTEP_CONFIG_FILE = $(DESTDIR)@GNUSTEP_CONFIG_FILE@
|
||||
GNUSTEP_CONFIG_FILE_DIR = $(dir $(GNUSTEP_CONFIG_FILE))
|
||||
GNUSTEP_SYSTEM_ROOT = $(special_prefix)@GNUSTEP_SYSTEM_ROOT@
|
||||
GNUSTEP_LOCAL_ROOT = $(special_prefix)@GNUSTEP_LOCAL_ROOT@
|
||||
GNUSTEP_NETWORK_ROOT = $(special_prefix)@GNUSTEP_NETWORK_ROOT@
|
||||
makedir = $(special_prefix)@GNUSTEP_MAKEFILES@
|
||||
GNUSTEP_SYSTEM_ROOT = $(DESTDIR)@GNUSTEP_SYSTEM_ROOT@
|
||||
GNUSTEP_LOCAL_ROOT = $(DESTDIR)@GNUSTEP_LOCAL_ROOT@
|
||||
GNUSTEP_NETWORK_ROOT = $(DESTDIR)@GNUSTEP_NETWORK_ROOT@
|
||||
makedir = $(DESTDIR)@GNUSTEP_MAKEFILES@
|
||||
srcdir = @srcdir@
|
||||
VPATH = @srcdir@
|
||||
|
||||
|
|
|
@ -34,7 +34,7 @@ CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{gs_prefix} --with-library-combo=%
|
|||
make
|
||||
|
||||
%install
|
||||
make install special_prefix=${RPM_BUILD_ROOT}
|
||||
make install DESTDIR=${RPM_BUILD_ROOT}
|
||||
|
||||
%ifos Linux
|
||||
mkdir -p ${RPM_BUILD_ROOT}/etc/profile.d
|
||||
|
|
Loading…
Reference in a new issue