gnustep/tools-make
0
0
Fork 0
mirror of https://github.com/gnustep/tools-make.git synced 2025-04-23 22:33:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Emit a warning if GNUSTEP_INSTALLATION_DIR is used. Ignore old xxx_RESOURCE_FILES_INSTALL_DIR settings if the new one is found

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@24549 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Nicola Pero 2007-02-14 12:08:47 +00:00
parent df3c0ad414
commit 0ef00c6ee9
3 changed files with 21 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ChangeLog
View file

@ -1,3 +1,13 @@
2007-02-14 Nicola Pero <nicola.pero@meta-innovation.com>
* Instance/resource-set.make (RESOURCE_FILES_INSTALL_DIR): Only use
xxx_RESOURCE_FILES_INSTALL_DIR if xxx_INSTALL_DIR is not set. In
this way, GNUmakefiles that need to be backwards compatible can set
both the old and the new variable, and work both with old and
new gnustep-makes.
* common.make: Emit a deprecation warning is
GNUSTEP_INSTALLATION_DIR is used.
2007-02-14 Nicola Pero <nicola.pero@meta-innovation.com>
* filesystem.sh.in: Unset all GNUSTEP_USER_DIR_* variables

15
Instance/resource-set.make
View file

@ -47,11 +47,16 @@ ifneq ($($(GNUSTEP_INSTANCE)_INSTALL_DIR),)
RESOURCE_FILES_INSTALL_DIR = $($(GNUSTEP_INSTANCE)_INSTALL_DIR)
endif
ifneq ($($(GNUSTEP_INSTANCE)_RESOURCE_FILES_INSTALL_DIR),)
# This is deprecated because we need to prepend GNUSTEP_INSTALLATION_DIR to it, which
# is deprecated. This was deprecated on 12 Feb 2007.
$(warning xxx_RESOURCE_FILES_INSTALL_DIR is deprecated, please use xxx_INSTALL_DIR instead)
RESOURCE_FILES_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/$($(GNUSTEP_INSTANCE)_RESOURCE_FILES_INSTALL_DIR)
# Use the old xxx_RESOURCE_FILES_INSTALL_DIR setting only if the new
# one is not available. If you need your makefile to be compatible
# with both old and new versions of make, you can use both settings.
ifeq ($($(GNUSTEP_INSTANCE)_INSTALL_DIR),)
ifneq ($($(GNUSTEP_INSTANCE)_RESOURCE_FILES_INSTALL_DIR),)
# This is deprecated because we need to prepend GNUSTEP_INSTALLATION_DIR to it, which
# is deprecated. This was deprecated on 12 Feb 2007.
$(warning xxx_RESOURCE_FILES_INSTALL_DIR is deprecated, please use xxx_INSTALL_DIR instead)
RESOURCE_FILES_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/$($(GNUSTEP_INSTANCE)_RESOURCE_FILES_INSTALL_DIR)
endif
endif
ifeq ($(RESOURCE_FILES_INSTALL_DIR),)

1
common.make
View file

@ -168,6 +168,7 @@ ifneq ($(GNUSTEP_INSTALLATION_DIR),)
# GNUstep filesystem rooted in GNUSTEP_INSTALLATION_DIR.
# This is not recommended since it does not work with custom
# filesystem configurations.
$(warning GNUSTEP_INSTALLATION_DIR is deprecated. Please use GNUSTEP_INSTALLATION_DOMAIN instead)
#
# DESTDIR allows you to relocate the entire installation somewhere else