From d92c305949247ef2542aed189659bef2358d2fe2 Mon Sep 17 00:00:00 2001 From: Jurij Smakov Date: Sat, 16 Jul 2005 18:55:04 +0000 Subject: [PATCH] Use debian/config.blah and not arch//config.blah as header files for header building, as the ones in arch are the incomplete files now. svn path=/trunk/kernel/source/linux-2.6-2.6.12/; revision=3568 --- debian/Makefile | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/debian/Makefile b/debian/Makefile index 27b6c1092..38a85191d 100644 --- a/debian/Makefile +++ b/debian/Makefile @@ -103,14 +103,11 @@ istamps := $(addprefix install-stamp-$(subarch)-, $(flavours)) # 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 @@ install-stamp-$(subarch)-%: build-$(subarch)-% build-stamp-$(subarch)-% 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