Try to get make package working with non-flattened hierarchy again.

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@23132 72102866-910b-0410-8b05-ffd578937521

ChangeLog

@@ -1,3 +1,11 @@
+2006-07-05  Richard Frith-Macdonald <rfm@gnu.org>
+
+	* GNUmakefile.in: install config.make in library combo specific
+	directory so that non-flattened builds can pick up the correct
+	config info for the library combo being used.
+	* common.make: pick up config.make from new location
+	* rules.make: know about new location for config.make
+
 2006-06-14  Richard Frith-Macdonald <rfm@gnu.org>
 
 	* common.make: determine host/target info before trying to load

GNUmakefile.in

@@ -25,9 +25,9 @@
 # but there is nothing to made, and the files get installed
 # in a special directory, so it was simpler this way.
 #
-
 include config.make
 
+
 # To install everything inside a temporary directory (say as part of
 # building a binary package - deb or rpm), use something like `make
 # install special_prefix=/var/tmp/gnustep-make'
@@ -182,7 +182,7 @@ install: all @GNUSTEP_MOVE_OBSOLETE@
 	                     $(makedir)/Instance/Documentation; \
 	   done; \
 	   $(INSTALL_DATA) executable.template $(makedir); \
-	   $(INSTALL_DATA) config.make $(makedir)/$(GNUSTEP_TARGET_DIR))
+	   $(INSTALL_DATA) config.make $(makedir)/$(GNUSTEP_TARGET_LDIR))
 	 $(EC)($(srcdir)/mkinstalldirs $(GNUSTEP_SYSTEM_ROOT)/share; \
 	   $(INSTALL_DATA) $(srcdir)/config.site $(GNUSTEP_SYSTEM_ROOT)/share)
 	$(EC)(if [ "@GNUSTEP_STRIP_MAKEFILES@" = "strip" ]; then \
@@ -234,7 +234,7 @@ uninstall:
 	done
 	rm -f $(makedir)/executable.template
 	rm -f $(GNUSTEP_SYSTEM_ROOT)/share/config.site
-	rm -f $(makedir)/$(GNUSTEP_TARGET_DIR)/config.make
+	rm -f $(makedir)/$(GNUSTEP_TARGET_LDIR)/config.make
 	-for f in $(makedir)/$(GNUSTEP_TARGET_CPU) \
 		$(makedir)/$(GNUSTEP_TARGET_DIR) \
 		$(makedir)/Additional \

common.make

@@ -47,7 +47,7 @@ endif
 # Get the config information (host/target specific),
 # this includes GNUSTEP_SYSTEM_ROOT etc.
 #
-include $(GNUSTEP_MAKEFILES)/$(GNUSTEP_TARGET_DIR)/config.make
+include $(GNUSTEP_MAKEFILES)/$(GNUSTEP_TARGET_LDIR)/config.make
 
 # GNUSTEP_BASE_INSTALL by default is `' - this is correct
 

rules.make

@@ -542,7 +542,11 @@ endif
 
 $(GNUSTEP_MAKEFILES)/*.make: ;
 
-$(GNUSTEP_MAKEFILES)/$(GNUSTEP_TARGET_DIR)/config.make: ;
+ifeq ($(GNUSTEP_FLATTENED)), )
+$(GNUSTEP_MAKEFILES)/$(GNUSTEP_TARGET_DIR)/$(LIBRARY_COMBO)/config.make: ;
+else
+$(GNUSTEP_MAKEFILES)/config.make: ;
+endif
 
 $(GNUSTEP_MAKEFILES)/Additional/*.make: ;