r4300 - people/waldi/linux-2.6/debian

[Bastian Blank]

Author: waldi
Date: 2005-10-03 20:23:02 +0000 (Mon, 03 Oct 2005)
New Revision: 4300

Modified:
   people/waldi/linux-2.6/debian/rules.real
Log:
debian/rules.real: Remove old definitions.


Modified: people/waldi/linux-2.6/debian/rules.real
===================================================================
--- people/waldi/linux-2.6/debian/rules.real	2005-09-28 05:50:16 UTC (rev 4299)
+++ people/waldi/linux-2.6/debian/rules.real	2005-10-03 20:23:02 UTC (rev 4300)
@@ -4,8 +4,6 @@
 # variable means that we are building for an arch without the subarch.
 # Additionally, variables version, abiname and ltver are
 # expected to be available (need to be exported from the parent process).
-# It is possible to override the flavours by setting the flavours
-# variable. It will also be passed a list of source files
 #
 SHELL  := sh -e
 DEB_HOST_ARCH     := $(shell dpkg-architecture -a$(ARCH) -qDEB_HOST_ARCH)
@@ -20,12 +18,6 @@
   basedir := debian/arch/$(ARCH)/$(SUBARCH)
 endif
 
-configs := $(notdir $(wildcard $(basedir)/config.*))
-configs := $(filter-out config, $(configs))
-ifndef flavours
-  flavours := $(patsubst config.%,%,$(configs))
-endif
-
 -include $(basedir)/Makefile.inc
 
 include debian/rules.defs
@@ -64,7 +56,7 @@
 ifndef headers_dirs
   headers_dirs = $(DEB_HOST_ARCH)
 endif
-ccommon = debian/arch/config debian/arch/$(ARCH)/config debian/arch/$(ARCH)/$(SUBARCH)/config
+configs = debian/arch/config debian/arch/$(ARCH)/config debian/arch/$(ARCH)/$(SUBARCH)/config
 
 #
 # Targets
@@ -107,10 +99,9 @@
 # arch/$(karch)/Makefile.inc.
 #
 $(BUILD_DIR)/config.$(ARCH)-$(SUBARCH)-$(FLAVOUR): $(basedir)/config.$(FLAVOUR)
-	@echo "configs=$(configs)"
 	@echo "Generating configuration file $@:"
 	rm -f $@
-	for i in $(ccommon); do	\
+	for i in $(configs); do	\
 	  if [ -f $${i} ]; then	\
 	    cat $${i} >> $@;	\
 	  fi;			\