r3568 - trunk/kernel/source/linux-2.6-2.6.12/debian

[Jurij Smakov]

Author: jurij-guest
Date: 2005-07-16 18:55:04 +0000 (Sat, 16 Jul 2005)
New Revision: 3568

Modified:
   trunk/kernel/source/linux-2.6-2.6.12/debian/Makefile
Log:
Use debian/config.blah and not arch/<arch>/config.blah
as header files for header building, as the ones in
arch are the incomplete files now.


Modified: trunk/kernel/source/linux-2.6-2.6.12/debian/Makefile
===================================================================
--- trunk/kernel/source/linux-2.6-2.6.12/debian/Makefile	2005-07-16 18:49:03 UTC (rev 3567)
+++ trunk/kernel/source/linux-2.6-2.6.12/debian/Makefile	2005-07-16 18:55:04 UTC (rev 3568)
@@ -103,14 +103,11 @@
 # this:
 # * If variable default_config is set (may be set in Makefile.inc)
 #   then config file config.$(default_config) will be used as default.
-# * If the file config.default exists, it will be used as a default.
 # * Otherwise, the config for the first flavour mentioned in $(flavours)
 #   will be used.
 #
-default_list := $(basedir)/config.$(default_config)
-default_list += $(basedir)/config.default
-default_list += $(basedir)/config.$(firstword $(flavours))
-default := $(firstword $(wildcard $(default_list)))
+default_list := debian/config.$(default_config)
+default_list += debian/config.$(firstword $(flavours))
 
 #
 # Targets
@@ -137,8 +134,9 @@
 	touch install-stamp-$(subarch)-$*
 
 headers-stamp: $(kdir)
-	@echo "I: Using $(default) as the header configuration file."
-	cp $(default) $(kdir)/.config
+	default='$(firstword $(wildcard $(default_list)))';		\
+	@echo "I: Using $${default} as the header configuration file.";	\
+	cp "$${default}" $(kdir)/.config
 	cd $(kdir); $(kpkg_headers_cmd)
 	cat $(kdir)/debian/files >> files
 	touch headers-stamp