diff --git a/ChangeLog b/ChangeLog index 09378a9..87af6c6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2008-12-19 Nicola Pero + + * All GNUmakefiles: removed GNUSTEP_CORE_SOFTWARE=YES and + added PACKAGE_NAME=gnustep-back. + * GNUmakefile: Export PACKAGE_NAME to reduce chances of a problem + if a GNUmakefile in a subdirectory is missing it. + 2008-12-18 Nicola Pero * All GNUmakefiles: added GNUSTEP_CORE_SOFTWARE=YES at the diff --git a/Documentation/Back/GNUmakefile b/Documentation/Back/GNUmakefile index 32b6cdf..98c7ebd 100644 --- a/Documentation/Back/GNUmakefile +++ b/Documentation/Back/GNUmakefile @@ -22,7 +22,7 @@ # Free Software Foundation, 51 Franklin Street, Fifth Floor, # Boston, MA 02110-1301, USA. -GNUSTEP_CORE_SOFTWARE = YES +PACKAGE_NAME = gnustep-back include $(GNUSTEP_MAKEFILES)/common.make # The documents to be generated diff --git a/Documentation/GNUmakefile b/Documentation/GNUmakefile index 137f2ef..14ac98b 100644 --- a/Documentation/GNUmakefile +++ b/Documentation/GNUmakefile @@ -22,7 +22,7 @@ # Free Software Foundation, 51 Franklin Street, Fifth Floor, # Boston, MA 02110-1301, USA. -GNUSTEP_CORE_SOFTWARE = YES +PACKAGE_NAME = gnustep-back GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES=../back.make include $(GNUSTEP_MAKEFILES)/common.make diff --git a/Fonts/GNUmakefile b/Fonts/GNUmakefile index f263706..104dd00 100644 --- a/Fonts/GNUmakefile +++ b/Fonts/GNUmakefile @@ -21,7 +21,7 @@ # License along with this library; if not, write to the Free # Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 USA. -GNUSTEP_CORE_SOFTWARE = YES +PACKAGE_NAME = gnustep-back GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES=../back.make include $(GNUSTEP_MAKEFILES)/common.make diff --git a/GNUmakefile b/GNUmakefile index a593865..b34f75b 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -31,8 +31,8 @@ ifeq ($(GNUSTEP_MAKEFILES),) $(error You need to set GNUSTEP_MAKEFILES before compiling!) endif -GNUSTEP_CORE_SOFTWARE = YES -export GNUSTEP_CORE_SOFTWARE +PACKAGE_NAME = gnustep-back +export PACKAGE_NAME RPM_DISABLE_RELOCATABLE=YES PACKAGE_NEEDS_CONFIGURE = YES @@ -42,8 +42,6 @@ SVN_BASE_URL = svn+ssh://svn.gna.org/svn/gnustep/libs GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES=back.make include $(GNUSTEP_MAKEFILES)/common.make -PACKAGE_NAME = gnustep-back - include ./Version # diff --git a/Source/GNUmakefile b/Source/GNUmakefile index 273e215..cae2e31 100644 --- a/Source/GNUmakefile +++ b/Source/GNUmakefile @@ -23,7 +23,7 @@ # Free Software Foundation, 51 Franklin Street, Fifth Floor, # Boston, MA 02110-1301, USA. -GNUSTEP_CORE_SOFTWARE = YES +PACKAGE_NAME = gnustep-back include $(GNUSTEP_MAKEFILES)/common.make include ../config.make diff --git a/Source/art/GNUmakefile b/Source/art/GNUmakefile index 3e5060f..9260b4f 100644 --- a/Source/art/GNUmakefile +++ b/Source/art/GNUmakefile @@ -24,7 +24,7 @@ # Free Software Foundation, 51 Franklin Street, Fifth Floor, # Boston, MA 02110-1301, USA. -GNUSTEP_CORE_SOFTWARE = YES +PACKAGE_NAME = gnustep-back GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES=../../back.make include $(GNUSTEP_MAKEFILES)/common.make diff --git a/Source/cairo/GNUmakefile b/Source/cairo/GNUmakefile index 1b7c8c9..c508b1e 100644 --- a/Source/cairo/GNUmakefile +++ b/Source/cairo/GNUmakefile @@ -20,7 +20,7 @@ # Free Software Foundation, 51 Franklin Street, Fifth Floor, # Boston, MA 02110-1301, USA. -GNUSTEP_CORE_SOFTWARE = YES +PACKAGE_NAME = gnustep-back GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES=../../back.make include $(GNUSTEP_MAKEFILES)/common.make diff --git a/Source/gsc/GNUmakefile b/Source/gsc/GNUmakefile index f94d1ca..b20fe0a 100644 --- a/Source/gsc/GNUmakefile +++ b/Source/gsc/GNUmakefile @@ -23,7 +23,7 @@ # Free Software Foundation, 51 Franklin Street, Fifth Floor, # Boston, MA 02110-1301, USA. -GNUSTEP_CORE_SOFTWARE = YES +PACKAGE_NAME = gnustep-back GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES=../../back.make include $(GNUSTEP_MAKEFILES)/common.make diff --git a/Source/win32/GNUmakefile b/Source/win32/GNUmakefile index cc424e7..6488f51 100644 --- a/Source/win32/GNUmakefile +++ b/Source/win32/GNUmakefile @@ -23,7 +23,7 @@ # Free Software Foundation, 51 Franklin Street, Fifth Floor, # Boston, MA 02110-1301, USA. -GNUSTEP_CORE_SOFTWARE = YES +PACKAGE_NAME = gnustep-back GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES=../../back.make include $(GNUSTEP_MAKEFILES)/common.make diff --git a/Source/winlib/GNUmakefile b/Source/winlib/GNUmakefile index e05aba5..3424d1e 100644 --- a/Source/winlib/GNUmakefile +++ b/Source/winlib/GNUmakefile @@ -23,7 +23,7 @@ # Free Software Foundation, 51 Franklin Street, Fifth Floor, # Boston, MA 02110-1301, USA. -GNUSTEP_CORE_SOFTWARE = YES +PACKAGE_NAME = gnustep-back GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES=../../back.make include $(GNUSTEP_MAKEFILES)/common.make diff --git a/Source/x11/GNUmakefile b/Source/x11/GNUmakefile index c213399..51b8ae1 100644 --- a/Source/x11/GNUmakefile +++ b/Source/x11/GNUmakefile @@ -22,7 +22,7 @@ # If not, see or write to the # Free Software Foundation, 51 Franklin Street, Fifth Floor, -GNUSTEP_CORE_SOFTWARE = YES +PACKAGE_NAME = gnustep-back GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES=../../back.make include $(GNUSTEP_MAKEFILES)/common.make diff --git a/Source/xdps/GNUmakefile b/Source/xdps/GNUmakefile index 9f42c07..6e6a127 100644 --- a/Source/xdps/GNUmakefile +++ b/Source/xdps/GNUmakefile @@ -23,7 +23,7 @@ # Free Software Foundation, 51 Franklin Street, Fifth Floor, # Boston, MA 02110-1301, USA. -GNUSTEP_CORE_SOFTWARE = YES +PACKAGE_NAME = gnustep-back GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES=../../back.make include $(GNUSTEP_MAKEFILES)/common.make diff --git a/Source/xlib/GNUmakefile b/Source/xlib/GNUmakefile index df73c41..efcad3a 100644 --- a/Source/xlib/GNUmakefile +++ b/Source/xlib/GNUmakefile @@ -23,7 +23,7 @@ # Free Software Foundation, 51 Franklin Street, Fifth Floor, # Boston, MA 02110-1301, USA. -GNUSTEP_CORE_SOFTWARE = YES +PACKAGE_NAME = gnustep-back GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES=../../back.make include $(GNUSTEP_MAKEFILES)/common.make diff --git a/Tools/GNUmakefile b/Tools/GNUmakefile index 52f50ad..078ee7c 100644 --- a/Tools/GNUmakefile +++ b/Tools/GNUmakefile @@ -23,7 +23,7 @@ # Free Software Foundation, 51 Franklin Street, Fifth Floor, # Boston, MA 02110-1301, USA. -GNUSTEP_CORE_SOFTWARE = YES +PACKAGE_NAME = gnustep-back GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES=../back.make include $(GNUSTEP_MAKEFILES)/common.make