From 1894e3d52792ed8561a42cd358f3f9fdbdcee156 Mon Sep 17 00:00:00 2001 From: Nicola Pero Date: Thu, 18 Dec 2008 18:37:45 +0000 Subject: [PATCH] Set GNUSTEP_CORE_SOFTWARE to YES so that gnustep-base is installed by default in SYSTEM if gnustep-make has been configured with --disable-packages git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@27333 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 9 +++++++++ Documentation/GNUmakefile | 1 + Documentation/General/GNUmakefile | 3 +-- Documentation/manual/GNUmakefile | 2 ++ Examples/GNUmakefile | 1 + GNUmakefile | 5 +++-- NSCharacterSets/GNUmakefile | 1 + NSTimeZones/GNUmakefile | 1 + Resources/GNUmakefile | 1 + SSL/GNUmakefile | 1 + Source/Additions/GNUmakefile | 1 + Source/GNUmakefile | 1 + Source/unix/GNUmakefile | 1 + Source/win32/GNUmakefile | 1 + Testing/GNUmakefile | 1 + Testing/synctest/GNUmakefile | 2 ++ Tools/GNUmakefile | 1 + Tools/make_strings/GNUmakefile | 3 +-- 18 files changed, 30 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1966a5bbf..c5122be09 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2008-12-18 Nicola Pero + + * All GNUmakefiles: added GNUSTEP_CORE_SOFTWARE=YES at the + beginning. + * GNUmakefile: Export GNUSTEP_CORE_SOFTWARE to reduce chances of a + problem if a GNUmakefile in a subdirectory is missing it. + * Documentation/General/GNUmakefile: Removed setting + GNUSTEP_INSTALLATION_DOMAIN to SYSTEM. + 2008-12-17 Richard Frith-Macdonald * Source/NSConnection.m: diff --git a/Documentation/GNUmakefile b/Documentation/GNUmakefile index 205e2fcda..dd1242286 100644 --- a/Documentation/GNUmakefile +++ b/Documentation/GNUmakefile @@ -29,6 +29,7 @@ ifeq ($(GNUSTEP_MAKEFILES),) $(error You need to set GNUSTEP_MAKEFILES before compiling!) endif +GNUSTEP_CORE_SOFTWARE = YES GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES=../base.make include $(GNUSTEP_MAKEFILES)/common.make diff --git a/Documentation/General/GNUmakefile b/Documentation/General/GNUmakefile index cec17d195..0e3f6fcbe 100644 --- a/Documentation/General/GNUmakefile +++ b/Documentation/General/GNUmakefile @@ -23,8 +23,7 @@ # Boston, MA 02111 USA # -# Install into the system root by default -GNUSTEP_INSTALLATION_DOMAIN = SYSTEM +GNUSTEP_CORE_SOFTWARE = YES include $(GNUSTEP_MAKEFILES)/common.make include ../../config.mak diff --git a/Documentation/manual/GNUmakefile b/Documentation/manual/GNUmakefile index c4f1922c1..16aed449d 100644 --- a/Documentation/manual/GNUmakefile +++ b/Documentation/manual/GNUmakefile @@ -18,6 +18,8 @@ # If not, write to the Free Software Foundation, # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +GNUSTEP_CORE_SOFTWARE = YES + include $(GNUSTEP_MAKEFILES)/common.make GNUSTEP_MAKEINFO_FLAGS = -D NO-TEXI2HTML diff --git a/Examples/GNUmakefile b/Examples/GNUmakefile index 0270ea701..88c80bb0b 100644 --- a/Examples/GNUmakefile +++ b/Examples/GNUmakefile @@ -31,6 +31,7 @@ ifeq ($(GNUSTEP_MAKEFILES),) $(error You need to set GNUSTEP_MAKEFILES before compiling!) endif +GNUSTEP_CORE_SOFTWARE = YES GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES = ../base.make include $(GNUSTEP_MAKEFILES)/common.make diff --git a/GNUmakefile b/GNUmakefile index 436e62efb..642c2bbd3 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -31,7 +31,9 @@ ifeq ($(GNUSTEP_MAKEFILES),) $(error You need to set GNUSTEP_MAKEFILES before compiling!) endif -RPM_DISABLE_RELOCATABLE=YES +GNUSTEP_CORE_SOFTWARE = YES +export GNUSTEP_CORE_SOFTWARE +RPM_DISABLE_RELOCATABLE = YES PACKAGE_NEEDS_CONFIGURE = YES SVN_MODULE_NAME = base @@ -62,4 +64,3 @@ SUBPROJECTS += Tools NSTimeZones Resources include $(GNUSTEP_MAKEFILES)/aggregate.make -include Makefile.postamble - diff --git a/NSCharacterSets/GNUmakefile b/NSCharacterSets/GNUmakefile index 9d0bd20ec..56eef4d73 100644 --- a/NSCharacterSets/GNUmakefile +++ b/NSCharacterSets/GNUmakefile @@ -29,6 +29,7 @@ ifeq ($(GNUSTEP_MAKEFILES),) $(error You need to set GNUSTEP_MAKEFILES before compiling!) endif +GNUSTEP_CORE_SOFTWARE = YES GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES=../base.make include $(GNUSTEP_MAKEFILES)/common.make diff --git a/NSTimeZones/GNUmakefile b/NSTimeZones/GNUmakefile index db8618396..5ca98f7c2 100644 --- a/NSTimeZones/GNUmakefile +++ b/NSTimeZones/GNUmakefile @@ -29,6 +29,7 @@ ifeq ($(GNUSTEP_MAKEFILES),) $(error You need to set GNUSTEP_MAKEFILES before compiling!) endif +GNUSTEP_CORE_SOFTWARE = YES GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES=../base.make include $(GNUSTEP_MAKEFILES)/common.make diff --git a/Resources/GNUmakefile b/Resources/GNUmakefile index fb65b6244..e870f462b 100644 --- a/Resources/GNUmakefile +++ b/Resources/GNUmakefile @@ -30,6 +30,7 @@ ifeq ($(GNUSTEP_MAKEFILES),) $(error You need to set GNUSTEP_MAKEFILES before compiling!) endif +GNUSTEP_CORE_SOFTWARE = YES GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES=../base.make include $(GNUSTEP_MAKEFILES)/common.make diff --git a/SSL/GNUmakefile b/SSL/GNUmakefile index 819df5a57..07923608b 100644 --- a/SSL/GNUmakefile +++ b/SSL/GNUmakefile @@ -31,6 +31,7 @@ ifeq ($(GNUSTEP_MAKEFILES),) $(error You need to set GNUSTEP_MAKEFILES before compiling!) endif +GNUSTEP_CORE_SOFTWARE = YES # This must set be before reading common.make, which will read the # Additional makefiles. GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES=../base.make diff --git a/Source/Additions/GNUmakefile b/Source/Additions/GNUmakefile index 0ff143681..4cdf15aac 100644 --- a/Source/Additions/GNUmakefile +++ b/Source/Additions/GNUmakefile @@ -23,6 +23,7 @@ # Boston, MA 02111 USA. # +GNUSTEP_CORE_SOFTWARE = YES GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES=../../base.make include $(GNUSTEP_MAKEFILES)/common.make diff --git a/Source/GNUmakefile b/Source/GNUmakefile index ff0f18b13..ce3e66e27 100644 --- a/Source/GNUmakefile +++ b/Source/GNUmakefile @@ -31,6 +31,7 @@ ifeq ($(GNUSTEP_MAKEFILES),) $(error You need to set GNUSTEP_MAKEFILES before compiling!) endif +GNUSTEP_CORE_SOFTWARE = YES GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES=../base.make include $(GNUSTEP_MAKEFILES)/common.make diff --git a/Source/unix/GNUmakefile b/Source/unix/GNUmakefile index 13d9a0dba..d48bfc432 100644 --- a/Source/unix/GNUmakefile +++ b/Source/unix/GNUmakefile @@ -22,6 +22,7 @@ # Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 USA. # +GNUSTEP_CORE_SOFTWARE = YES GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES=../../base.make include $(GNUSTEP_MAKEFILES)/common.make diff --git a/Source/win32/GNUmakefile b/Source/win32/GNUmakefile index e84610392..3acab23d7 100644 --- a/Source/win32/GNUmakefile +++ b/Source/win32/GNUmakefile @@ -22,6 +22,7 @@ # Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 USA. # +GNUSTEP_CORE_SOFTWARE = YES GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES=../../base.make include $(GNUSTEP_MAKEFILES)/common.make diff --git a/Testing/GNUmakefile b/Testing/GNUmakefile index 74676e85d..fe224dc8b 100644 --- a/Testing/GNUmakefile +++ b/Testing/GNUmakefile @@ -30,6 +30,7 @@ ifeq ($(GNUSTEP_MAKEFILES),) $(error You need to set GNUSTEP_MAKEFILES before compiling!) endif +GNUSTEP_CORE_SOFTWARE = YES GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES=../base.make include $(GNUSTEP_MAKEFILES)/common.make diff --git a/Testing/synctest/GNUmakefile b/Testing/synctest/GNUmakefile index 71e2edaba..ca49089ce 100644 --- a/Testing/synctest/GNUmakefile +++ b/Testing/synctest/GNUmakefile @@ -1,3 +1,5 @@ +GNUSTEP_CORE_SOFTWARE = YES + # # GNUmakefile - Generated by ProjectCenter # diff --git a/Tools/GNUmakefile b/Tools/GNUmakefile index 27bf4047e..5c81f207a 100644 --- a/Tools/GNUmakefile +++ b/Tools/GNUmakefile @@ -29,6 +29,7 @@ ifeq ($(GNUSTEP_MAKEFILES),) $(error You need to set GNUSTEP_MAKEFILES before compiling!) endif +GNUSTEP_CORE_SOFTWARE = YES GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES=../base.make include $(GNUSTEP_MAKEFILES)/common.make diff --git a/Tools/make_strings/GNUmakefile b/Tools/make_strings/GNUmakefile index f9ae84c34..58ff71790 100644 --- a/Tools/make_strings/GNUmakefile +++ b/Tools/make_strings/GNUmakefile @@ -21,8 +21,7 @@ # Software Foundation, Inc., 51 Franklin Street, Fifth Floor, # Boston, MA 02111 USA. -# Install into the system root by default - +GNUSTEP_CORE_SOFTWARE = YES GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES=../../base.make include $(GNUSTEP_MAKEFILES)/common.make include ../../config.mak