Fixed DESTDIR; only add it at the top-most invocation

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@23782 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Nicola Pero 2006-10-06 23:04:10 +00:00
parent e504a9154c
commit e183e39d29
2 changed files with 12 additions and 2 deletions

View file

@ -1,3 +1,7 @@
2006-10-07 Nicola Pero <nicola.pero@meta-innovation.com>
* common.make: Add DESTDIR only on the very topmost invocation.
2006-10-06 Richard Frith-Macdonald <rfm@gnu.org>
* Documentation/machines.texi: Mention that Debian/em64t works and

View file

@ -167,8 +167,14 @@ endif
# DESTDIR allows you to relocate the entire installation somewhere else
# (as per GNU Coding Standards).
#
ifneq ($(DESTDIR),)
override GNUSTEP_INSTALLATION_DIR := $(DESTDIR)/$(GNUSTEP_INSTALLATION_DIR)
# Add DESTDIR as a prefix to GNUSTEP_INSTALLATION_DIR, but only if we're
# at the first top-level invocation. Else we risk adding it multiple
# times ;-)
#
ifeq ($(_GNUSTEP_TOP_INVOCATION_DONE),)
ifneq ($(DESTDIR),)
override GNUSTEP_INSTALLATION_DIR := $(DESTDIR)/$(GNUSTEP_INSTALLATION_DIR)
endif
endif
# Make it public and available to all submakes invocations