From 933c52af50c0a30816560a03f8ae47b0da89c610 Mon Sep 17 00:00:00 2001 From: Richard Frith-MacDonald Date: Thu, 27 Nov 2008 13:53:17 +0000 Subject: [PATCH] Don't override installation domain git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@27148 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 20 ++++++++++++++++++++ Documentation/GNUmakefile | 3 --- GNUmakefile | 4 ---- NSCharacterSets/GNUmakefile | 3 --- NSTimeZones/GNUmakefile | 3 --- Resources/GNUmakefile | 2 -- SSL/GNUmakefile | 3 --- Source/GNUmakefile | 3 --- Tools/GNUmakefile | 3 --- 9 files changed, 20 insertions(+), 24 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5ba69d849..f13a2c4ba 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,23 @@ +2008-11-27 Richard Frith-Macdonald + + * Documentation/GNUmakefile: + * GNUmakefile: + * NSCharacterSets/GNUmakefile: + * NSTimeZones/GNUmakefile: + * Resources/GNUmakefile: + * Source/GNUmakefile: + * SSL/GNUmakefile: + * Tools/GNUmakefile: + Removed GNUSTEP_INSTALLATION_DOMAIN. + NB. This means that gnustep-base will now install in the local domain + by default, and to get the old behavior you will need to do + 'make GNUSTEP_INSTALLATION_DOMAIN=SYSTEM install' + The rationale for this change is that the system domain is for + resources installed by the operating system packagers, but the + local domain is for add-ons you install yourself (to be used by + all users of the system), and you don't normally want to overwrite + the operating system supplied version by accident. + 2008-11-26 10:09-EST Gregory John Casamento * Headers/Additions/GNUstepBase/GSVersionMacros.h: Add diff --git a/Documentation/GNUmakefile b/Documentation/GNUmakefile index 455814b71..205e2fcda 100644 --- a/Documentation/GNUmakefile +++ b/Documentation/GNUmakefile @@ -29,9 +29,6 @@ ifeq ($(GNUSTEP_MAKEFILES),) $(error You need to set GNUSTEP_MAKEFILES before compiling!) endif -# Install into the system root by default -GNUSTEP_INSTALLATION_DOMAIN = SYSTEM - GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES=../base.make include $(GNUSTEP_MAKEFILES)/common.make diff --git a/GNUmakefile b/GNUmakefile index 0c58ae503..436e62efb 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -31,10 +31,6 @@ ifeq ($(GNUSTEP_MAKEFILES),) $(error You need to set GNUSTEP_MAKEFILES before compiling!) endif -# Install into the system root by default -# FIXME: would it work if you want to install it into local -GNUSTEP_INSTALLATION_DOMAIN = SYSTEM - RPM_DISABLE_RELOCATABLE=YES PACKAGE_NEEDS_CONFIGURE = YES diff --git a/NSCharacterSets/GNUmakefile b/NSCharacterSets/GNUmakefile index 4c8b72e70..9d0bd20ec 100644 --- a/NSCharacterSets/GNUmakefile +++ b/NSCharacterSets/GNUmakefile @@ -29,9 +29,6 @@ ifeq ($(GNUSTEP_MAKEFILES),) $(error You need to set GNUSTEP_MAKEFILES before compiling!) endif -# Install into the system root by default -GNUSTEP_INSTALLATION_DOMAIN = SYSTEM - GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES=../base.make include $(GNUSTEP_MAKEFILES)/common.make diff --git a/NSTimeZones/GNUmakefile b/NSTimeZones/GNUmakefile index de9f540bb..db8618396 100644 --- a/NSTimeZones/GNUmakefile +++ b/NSTimeZones/GNUmakefile @@ -29,9 +29,6 @@ ifeq ($(GNUSTEP_MAKEFILES),) $(error You need to set GNUSTEP_MAKEFILES before compiling!) endif -# Install into the system root by default -GNUSTEP_INSTALLATION_DOMAIN = SYSTEM - GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES=../base.make include $(GNUSTEP_MAKEFILES)/common.make diff --git a/Resources/GNUmakefile b/Resources/GNUmakefile index 30c375ab3..fb65b6244 100644 --- a/Resources/GNUmakefile +++ b/Resources/GNUmakefile @@ -30,8 +30,6 @@ ifeq ($(GNUSTEP_MAKEFILES),) $(error You need to set GNUSTEP_MAKEFILES before compiling!) endif -GNUSTEP_INSTALLATION_DOMAIN = SYSTEM - GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES=../base.make include $(GNUSTEP_MAKEFILES)/common.make diff --git a/SSL/GNUmakefile b/SSL/GNUmakefile index d008278f0..819df5a57 100644 --- a/SSL/GNUmakefile +++ b/SSL/GNUmakefile @@ -31,9 +31,6 @@ ifeq ($(GNUSTEP_MAKEFILES),) $(error You need to set GNUSTEP_MAKEFILES before compiling!) endif -# Install into the system root by default -GNUSTEP_INSTALLATION_DOMAIN = SYSTEM - # This must set be before reading common.make, which will read the # Additional makefiles. GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES=../base.make diff --git a/Source/GNUmakefile b/Source/GNUmakefile index 9bff376b5..96b5c973d 100644 --- a/Source/GNUmakefile +++ b/Source/GNUmakefile @@ -31,9 +31,6 @@ ifeq ($(GNUSTEP_MAKEFILES),) $(error You need to set GNUSTEP_MAKEFILES before compiling!) endif -# Install into the system root by default -GNUSTEP_INSTALLATION_DOMAIN = SYSTEM - GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES=../base.make include $(GNUSTEP_MAKEFILES)/common.make diff --git a/Tools/GNUmakefile b/Tools/GNUmakefile index 7965f4436..27bf4047e 100644 --- a/Tools/GNUmakefile +++ b/Tools/GNUmakefile @@ -29,9 +29,6 @@ ifeq ($(GNUSTEP_MAKEFILES),) $(error You need to set GNUSTEP_MAKEFILES before compiling!) endif -# Install into the system root by default -GNUSTEP_INSTALLATION_DOMAIN = SYSTEM - GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES=../base.make include $(GNUSTEP_MAKEFILES)/common.make