From 63885e2dd52d11e496bc0b819c2e43e60d6ec974 Mon Sep 17 00:00:00 2001 From: nicola Date: Thu, 18 Dec 2008 18:45:01 +0000 Subject: [PATCH] Set GNUSTEP_CORE_SOFTWARE to YES so that gnustep-gui 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/gui/trunk@27334 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 7 +++++++ ColorPickers/GNUmakefile | 1 + Documentation/GNUmakefile | 1 + Documentation/General/GNUmakefile | 1 + Documentation/GuiUser/GNUmakefile | 1 + Documentation/manual/GNUmakefile | 1 + GNUmakefile | 2 ++ Images/GNUmakefile | 1 + Model/GNUmakefile | 1 + Panels/GNUmakefile | 1 + PrinterTypes/GNUmakefile | 3 ++- Printing/GNUmakefile | 1 + Printing/GSCUPS/GNUmakefile | 1 + Printing/GSLPR/GNUmakefile | 1 + Resources/GNUmakefile | 1 + Source/GNUmakefile | 1 + TextConverters/GNUmakefile | 1 + TextConverters/RTF/GNUmakefile | 1 + Tools/GNUmakefile | 1 + Tools/gsnd/GNUmakefile | 1 + 20 files changed, 28 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index aece43a78..00947ad02 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +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. + 2008-12-17 21:20-EST Gregory John Casamento * Source/GSNibLoading.m: Remove change which resets the bounds diff --git a/ColorPickers/GNUmakefile b/ColorPickers/GNUmakefile index e23f7a44f..a4fc334df 100644 --- a/ColorPickers/GNUmakefile +++ b/ColorPickers/GNUmakefile @@ -25,6 +25,7 @@ # Free Software Foundation, 51 Franklin Street, Fifth Floor, # Boston, MA 02110-1301, USA. +GNUSTEP_CORE_SOFTWARE = YES GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES = ../gui.make include $(GNUSTEP_MAKEFILES)/common.make diff --git a/Documentation/GNUmakefile b/Documentation/GNUmakefile index 35d5d03c4..4b80efa62 100644 --- a/Documentation/GNUmakefile +++ b/Documentation/GNUmakefile @@ -22,6 +22,7 @@ # Free Software Foundation, 51 Franklin Street, Fifth Floor, # Boston, MA 02110-1301, USA. +GNUSTEP_CORE_SOFTWARE = YES GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES=../gui.make include $(GNUSTEP_MAKEFILES)/common.make diff --git a/Documentation/General/GNUmakefile b/Documentation/General/GNUmakefile index d632b9589..b6ec233c3 100644 --- a/Documentation/General/GNUmakefile +++ b/Documentation/General/GNUmakefile @@ -23,6 +23,7 @@ # Free Software Foundation, 51 Franklin Street, Fifth Floor, # Boston, MA 02110-1301, USA. +GNUSTEP_CORE_SOFTWARE = YES include $(GNUSTEP_MAKEFILES)/common.make include ../../config.make diff --git a/Documentation/GuiUser/GNUmakefile b/Documentation/GuiUser/GNUmakefile index 934d1c3ca..a4d6f209d 100644 --- a/Documentation/GuiUser/GNUmakefile +++ b/Documentation/GuiUser/GNUmakefile @@ -23,6 +23,7 @@ # Free Software Foundation, 51 Franklin Street, Fifth Floor, # Boston, MA 02110-1301, USA. +GNUSTEP_CORE_SOFTWARE = YES include $(GNUSTEP_MAKEFILES)/common.make include ../../config.make diff --git a/Documentation/manual/GNUmakefile b/Documentation/manual/GNUmakefile index a127dc06c..cc3eee0db 100644 --- a/Documentation/manual/GNUmakefile +++ b/Documentation/manual/GNUmakefile @@ -1,3 +1,4 @@ +GNUSTEP_CORE_SOFTWARE = YES include $(GNUSTEP_MAKEFILES)/common.make DOCUMENT_NAME = AppKit diff --git a/GNUmakefile b/GNUmakefile index d47f92137..3c9a11308 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -31,6 +31,8 @@ ifeq ($(GNUSTEP_MAKEFILES),) $(error You need to set GNUSTEP_MAKEFILES before compiling!) endif +GNUSTEP_CORE_SOFTWARE = YES +export GNUSTEP_CORE_SOFTWARE RPM_DISABLE_RELOCATABLE=YES PACKAGE_NEEDS_CONFIGURE = YES diff --git a/Images/GNUmakefile b/Images/GNUmakefile index 2dae62f59..4c624d552 100644 --- a/Images/GNUmakefile +++ b/Images/GNUmakefile @@ -23,6 +23,7 @@ # Free Software Foundation, 51 Franklin Street, Fifth Floor, # Boston, MA 02110-1301, USA. +GNUSTEP_CORE_SOFTWARE = YES GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES=../gui.make include $(GNUSTEP_MAKEFILES)/common.make diff --git a/Model/GNUmakefile b/Model/GNUmakefile index 9a1749518..6ac9c897f 100644 --- a/Model/GNUmakefile +++ b/Model/GNUmakefile @@ -23,6 +23,7 @@ # Free Software Foundation, 51 Franklin Street, Fifth Floor, # Boston, MA 02110-1301, USA. +GNUSTEP_CORE_SOFTWARE = YES GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES=../gui.make include $(GNUSTEP_MAKEFILES)/common.make diff --git a/Panels/GNUmakefile b/Panels/GNUmakefile index 19abb3b2f..bf2b31cfb 100644 --- a/Panels/GNUmakefile +++ b/Panels/GNUmakefile @@ -24,6 +24,7 @@ # Free Software Foundation, 51 Franklin Street, Fifth Floor, # Boston, MA 02110-1301, USA. +GNUSTEP_CORE_SOFTWARE = YES GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES=../gui.make include $(GNUSTEP_MAKEFILES)/common.make diff --git a/PrinterTypes/GNUmakefile b/PrinterTypes/GNUmakefile index 31988f3a8..c55187182 100644 --- a/PrinterTypes/GNUmakefile +++ b/PrinterTypes/GNUmakefile @@ -23,6 +23,7 @@ # Free Software Foundation, 51 Franklin Street, Fifth Floor, # Boston, MA 02110-1301, USA. +GNUSTEP_CORE_SOFTWARE = YES GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES=../gui.make include $(GNUSTEP_MAKEFILES)/common.make @@ -30,7 +31,7 @@ include ../Version RES_INSTALL_DIR = $(GNUSTEP_LIBRARY)/PostScript PPD_INSTALL_DIR = $(GNUSTEP_LIBRARY)/PostScript/PPD - + RESOURCE_DIRS = English.lproj RESOURCE_FILES = GSProlog.ps diff --git a/Printing/GNUmakefile b/Printing/GNUmakefile index 5e9be8c98..85cb4f175 100644 --- a/Printing/GNUmakefile +++ b/Printing/GNUmakefile @@ -24,6 +24,7 @@ # Free Software Foundation, 51 Franklin Street, Fifth Floor, # Boston, MA 02110-1301, USA. +GNUSTEP_CORE_SOFTWARE = YES include $(GNUSTEP_MAKEFILES)/common.make GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES=../gui.make diff --git a/Printing/GSCUPS/GNUmakefile b/Printing/GSCUPS/GNUmakefile index 764333ca7..3153c06f4 100644 --- a/Printing/GSCUPS/GNUmakefile +++ b/Printing/GSCUPS/GNUmakefile @@ -25,6 +25,7 @@ # Free Software Foundation, 51 Franklin Street, Fifth Floor, # Boston, MA 02110-1301, USA. +GNUSTEP_CORE_SOFTWARE = YES GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES=../../gui.make include $(GNUSTEP_MAKEFILES)/common.make diff --git a/Printing/GSLPR/GNUmakefile b/Printing/GSLPR/GNUmakefile index cf4e46083..289a8378a 100644 --- a/Printing/GSLPR/GNUmakefile +++ b/Printing/GSLPR/GNUmakefile @@ -25,6 +25,7 @@ # Free Software Foundation, 51 Franklin Street, Fifth Floor, # Boston, MA 02110-1301, USA. +GNUSTEP_CORE_SOFTWARE = YES GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES=../../gui.make include $(GNUSTEP_MAKEFILES)/common.make diff --git a/Resources/GNUmakefile b/Resources/GNUmakefile index 1e560a21a..ffcbcd6e6 100644 --- a/Resources/GNUmakefile +++ b/Resources/GNUmakefile @@ -23,6 +23,7 @@ # Free Software Foundation, 51 Franklin Street, Fifth Floor, # Boston, MA 02110-1301, USA. +GNUSTEP_CORE_SOFTWARE = YES GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES=../gui.make include $(GNUSTEP_MAKEFILES)/common.make diff --git a/Source/GNUmakefile b/Source/GNUmakefile index 30c31b01e..4ddd5dcc0 100644 --- a/Source/GNUmakefile +++ b/Source/GNUmakefile @@ -22,6 +22,7 @@ # Free Software Foundation, 51 Franklin Street, Fifth Floor, # Boston, MA 02110-1301, USA. +GNUSTEP_CORE_SOFTWARE = YES GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES=../gui.make include $(GNUSTEP_MAKEFILES)/common.make diff --git a/TextConverters/GNUmakefile b/TextConverters/GNUmakefile index 14ab0fc0c..f845765f8 100644 --- a/TextConverters/GNUmakefile +++ b/TextConverters/GNUmakefile @@ -23,6 +23,7 @@ # Free Software Foundation, 51 Franklin Street, Fifth Floor, # Boston, MA 02110-1301, USA. +GNUSTEP_CORE_SOFTWARE = YES include $(GNUSTEP_MAKEFILES)/common.make # # The list of subproject directories diff --git a/TextConverters/RTF/GNUmakefile b/TextConverters/RTF/GNUmakefile index 08964df3a..9f3375679 100644 --- a/TextConverters/RTF/GNUmakefile +++ b/TextConverters/RTF/GNUmakefile @@ -22,6 +22,7 @@ # Free Software Foundation, 51 Franklin Street, Fifth Floor, # Boston, MA 02110-1301, USA. +GNUSTEP_CORE_SOFTWARE = YES include $(GNUSTEP_MAKEFILES)/common.make BUNDLE_NAME = RTFConverter diff --git a/Tools/GNUmakefile b/Tools/GNUmakefile index 94c5dedba..23cd87eef 100644 --- a/Tools/GNUmakefile +++ b/Tools/GNUmakefile @@ -21,6 +21,7 @@ # Free Software Foundation, 51 Franklin Street, Fifth Floor, # Boston, MA 02110-1301, USA. +GNUSTEP_CORE_SOFTWARE = YES GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES=../gui.make include $(GNUSTEP_MAKEFILES)/common.make include ../config.make diff --git a/Tools/gsnd/GNUmakefile b/Tools/gsnd/GNUmakefile index 02735c864..9abea74e9 100644 --- a/Tools/gsnd/GNUmakefile +++ b/Tools/gsnd/GNUmakefile @@ -21,6 +21,7 @@ # Free Software Foundation, 51 Franklin Street, Fifth Floor, # Boston, MA 02110-1301, USA. +GNUSTEP_CORE_SOFTWARE = YES include $(GNUSTEP_MAKEFILES)/common.make # The applications to be compiled