Index: config.mak.in =================================================================== --- config.mak.in (Revision 28264) +++ config.mak.in (Arbeitskopie) @@ -6,6 +6,7 @@ # are permitted in any medium without royalty provided the copyright # notice and this notice are preserved. +GNUSTEP_MAKEFILES=@GNUSTEP_MAKEFILES@ WHOAMI=@WHOAMI@ Index: NSCharacterSets/GNUmakefile =================================================================== --- NSCharacterSets/GNUmakefile (Revision 28264) +++ NSCharacterSets/GNUmakefile (Arbeitskopie) @@ -21,14 +21,8 @@ # Software Foundation, Inc., 51 Franklin Street, Fifth Floor, # Boston, MA 02111 USA. -ifeq ($(GNUSTEP_MAKEFILES),) - GNUSTEP_MAKEFILES := $(shell gnustep-config --variable=GNUSTEP_MAKEFILES 2>/dev/null) -endif +include ../config.mak -ifeq ($(GNUSTEP_MAKEFILES),) - $(error You need to set GNUSTEP_MAKEFILES before compiling!) -endif - PACKAGE_NAME = gnustep-base GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES=../base.make Index: Source/GNUmakefile =================================================================== --- Source/GNUmakefile (Revision 28264) +++ Source/GNUmakefile (Arbeitskopie) @@ -23,21 +23,13 @@ # Boston, MA 02111 USA. # -ifeq ($(GNUSTEP_MAKEFILES),) - GNUSTEP_MAKEFILES := $(shell gnustep-config --variable=GNUSTEP_MAKEFILES 2>/dev/null) -endif +include ../config.mak -ifeq ($(GNUSTEP_MAKEFILES),) - $(error You need to set GNUSTEP_MAKEFILES before compiling!) -endif - PACKAGE_NAME = gnustep-base GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES=../base.make include $(GNUSTEP_MAKEFILES)/common.make - include ../Version -include ../config.mak include pathconfig/pathconfig.mak # Interface version changes with each minor release Index: SSL/GNUmakefile =================================================================== --- SSL/GNUmakefile (Revision 28264) +++ SSL/GNUmakefile (Arbeitskopie) @@ -23,22 +23,14 @@ # Boston, MA 02111 USA. # -ifeq ($(GNUSTEP_MAKEFILES),) - GNUSTEP_MAKEFILES := $(shell gnustep-config --variable=GNUSTEP_MAKEFILES 2>/dev/null) -endif +-include ../config.mak -ifeq ($(GNUSTEP_MAKEFILES),) - $(error You need to set GNUSTEP_MAKEFILES before compiling!) -endif - PACKAGE_NAME = gnustep-base # This must set be before reading common.make, which will read the # Additional makefiles. GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES=../base.make include $(GNUSTEP_MAKEFILES)/common.make - --include ../config.mak -include ../Source/pathconfig/pathconfig.mak -include config.mak Index: configure.ac =================================================================== --- configure.ac (Revision 28264) +++ configure.ac (Arbeitskopie) @@ -38,6 +38,7 @@ if test -z "$GNUSTEP_MAKEFILES"; then GNUSTEP_MAKEFILES=`gnustep-config --variable=GNUSTEP_MAKEFILES 2>&5` fi +AC_SUBST(GNUSTEP_MAKEFILES) # If LIBRARY_COMBO is undefined, try to use gnustep-config to determine it. if test -z "$LIBRARY_COMBO"; then Index: Documentation/GNUmakefile =================================================================== --- Documentation/GNUmakefile (Revision 28264) +++ Documentation/GNUmakefile (Arbeitskopie) @@ -21,21 +21,13 @@ # Software Foundation, Inc., 51 Franklin Street, Fifth Floor, # Boston, MA 02111 USA. -ifeq ($(GNUSTEP_MAKEFILES),) - GNUSTEP_MAKEFILES := $(shell gnustep-config --variable=GNUSTEP_MAKEFILES 2>/dev/null) -endif +include ../config.mak -ifeq ($(GNUSTEP_MAKEFILES),) - $(error You need to set GNUSTEP_MAKEFILES before compiling!) -endif - PACKAGE_NAME = gnustep-base GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES=../base.make include $(GNUSTEP_MAKEFILES)/common.make - include ../Version -include ../config.mak include ../Source/pathconfig/pathconfig.mak # The documents to be generated Index: Documentation/General/GNUmakefile =================================================================== --- Documentation/General/GNUmakefile (Revision 28264) +++ Documentation/General/GNUmakefile (Arbeitskopie) @@ -25,8 +25,8 @@ PACKAGE_NAME = gnustep-base +include ../../config.mak include $(GNUSTEP_MAKEFILES)/common.make -include ../../config.mak DOCUMENT_NAME = General Index: Resources/GNUmakefile =================================================================== --- Resources/GNUmakefile (Revision 28264) +++ Resources/GNUmakefile (Arbeitskopie) @@ -22,14 +22,8 @@ # Software Foundation, Inc., 51 Franklin Street, Fifth Floor, # Boston, MA 02111 USA. -ifeq ($(GNUSTEP_MAKEFILES),) - GNUSTEP_MAKEFILES := $(shell gnustep-config --variable=GNUSTEP_MAKEFILES 2>/dev/null) -endif +include ../config.mak -ifeq ($(GNUSTEP_MAKEFILES),) - $(error You need to set GNUSTEP_MAKEFILES before compiling!) -endif - PACKAGE_NAME = gnustep-base GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES=../base.make Index: NSTimeZones/GNUmakefile =================================================================== --- NSTimeZones/GNUmakefile (Revision 28264) +++ NSTimeZones/GNUmakefile (Arbeitskopie) @@ -21,21 +21,13 @@ # Software Foundation, Inc., 51 Franklin Street, Fifth Floor, # Boston, MA 02111 USA. -ifeq ($(GNUSTEP_MAKEFILES),) - GNUSTEP_MAKEFILES := $(shell gnustep-config --variable=GNUSTEP_MAKEFILES 2>/dev/null) -endif +include ../config.mak -ifeq ($(GNUSTEP_MAKEFILES),) - $(error You need to set GNUSTEP_MAKEFILES before compiling!) -endif - PACKAGE_NAME = gnustep-base GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES=../base.make include $(GNUSTEP_MAKEFILES)/common.make - include ../Version -include ../config.mak include ../Source/pathconfig/pathconfig.mak libgnustep-base_INTERFACE_VERSION=$(MAJOR_VERSION).$(MINOR_VERSION) Index: Examples/GNUmakefile =================================================================== --- Examples/GNUmakefile (Revision 28264) +++ Examples/GNUmakefile (Arbeitskopie) @@ -23,14 +23,8 @@ # Boston, MA 02111 USA. # -ifeq ($(GNUSTEP_MAKEFILES),) - GNUSTEP_MAKEFILES := $(shell gnustep-config --variable=GNUSTEP_MAKEFILES 2>/dev/null) -endif +include ../config.mak -ifeq ($(GNUSTEP_MAKEFILES),) - $(error You need to set GNUSTEP_MAKEFILES before compiling!) -endif - PACKAGE_NAME = gnustep-base GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES = ../base.make Index: GNUmakefile =================================================================== --- GNUmakefile (Revision 28264) +++ GNUmakefile (Arbeitskopie) @@ -23,14 +23,6 @@ # Boston, MA 02111 USA # -ifeq ($(GNUSTEP_MAKEFILES),) - GNUSTEP_MAKEFILES := $(shell gnustep-config --variable=GNUSTEP_MAKEFILES 2>/dev/null) -endif - -ifeq ($(GNUSTEP_MAKEFILES),) - $(error You need to set GNUSTEP_MAKEFILES before compiling!) -endif - -include config.mak GNUSTEP_CORE_SOFTWARE = YES Index: Tools/GNUmakefile =================================================================== --- Tools/GNUmakefile (Revision 28264) +++ Tools/GNUmakefile (Arbeitskopie) @@ -21,21 +21,13 @@ # Software Foundation, Inc., 51 Franklin Street, Fifth Floor, # Boston, MA 02111 USA. -ifeq ($(GNUSTEP_MAKEFILES),) - GNUSTEP_MAKEFILES := $(shell gnustep-config --variable=GNUSTEP_MAKEFILES 2>/dev/null) -endif +include ../config.mak -ifeq ($(GNUSTEP_MAKEFILES),) - $(error You need to set GNUSTEP_MAKEFILES before compiling!) -endif - PACKAGE_NAME = gnustep-base GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES=../base.make include $(GNUSTEP_MAKEFILES)/common.make - include ../Version -include ../config.mak include ../Source/pathconfig/pathconfig.mak # DTDs to install