r4384 - dists/trunk/linux-2.6/debian

[Bastian Blank]

Author: waldi
Date: 2005-10-10 17:35:10 +0000 (Mon, 10 Oct 2005)
New Revision: 4384

Modified:
   dists/trunk/linux-2.6/debian/rules.real
Log:
debian/rules.real: Use correct config files.


Modified: dists/trunk/linux-2.6/debian/rules.real
===================================================================
--- dists/trunk/linux-2.6/debian/rules.real	2005-10-10 17:33:50 UTC (rev 4383)
+++ dists/trunk/linux-2.6/debian/rules.real	2005-10-10 17:35:10 UTC (rev 4384)
@@ -64,7 +64,6 @@
 ifndef headers_dirs
   headers_dirs = $(DEB_HOST_ARCH)
 endif
-ccommon = debian/arch/config debian/arch/$(ARCH)/config debian/arch/$(ARCH)/$(SUBARCH)/config
 
 #
 # Targets
@@ -106,11 +105,14 @@
 # config file by setting include_common_config = no in the
 # arch/$(karch)/Makefile.inc.
 #
-$(BUILD_DIR)/config.$(ARCH)-$(SUBARCH)-$(FLAVOUR): $(basedir)/config.$(FLAVOUR)
-	@echo "configs=$(configs)"
+config_common = debian/arch/config debian/arch/$(ARCH)/config
+ifneq ($(SUBARCH),none)
+  config_common += debian/arch/$(ARCH)/$(SUBARCH)/config
+endif
+$(BUILD_DIR)/config.$(ARCH)-$(SUBARCH)-$(FLAVOUR): $(basedir)/config.$(FLAVOUR) $(config_common)
 	@echo "Generating configuration file $@:"
 	rm -f $@
-	for i in $(ccommon); do	\
+	for i in $(config_common); do	\
 	  if [ -f $${i} ]; then	\
 	    cat $${i} >> $@;	\
 	  fi;			\