[kernel] r7049 - dists/trunk/linux-2.6/debian/modules

[Bastian Blank]

Author: waldi
Date: Wed Jul 19 23:23:44 2006
New Revision: 7049

Modified:
   dists/trunk/linux-2.6/debian/modules/rules.include

Log:
debian/modules/rules.include:
Add support directory as first argument to gencontrol.


Modified: dists/trunk/linux-2.6/debian/modules/rules.include
==============================================================================
--- dists/trunk/linux-2.6/debian/modules/rules.include	(original)
+++ dists/trunk/linux-2.6/debian/modules/rules.include	Wed Jul 19 23:23:44 2006
@@ -5,8 +5,10 @@
 
 include $(__MODULES_DIR)rules.defs
 
-build: debian/control $(STAMPS_DIR)/build-stamp
-$(STAMPS_DIR)/build-stamp: $(BUILD_DIR) $(STAMPS_DIR)
+BUILD_STAMP = $(STAMPS_DIR)/build-base
+
+build: debian/control $(BUILD_STAMP)
+$(BUILD_STAMP)/build-base: $(BUILD_DIR) $(STAMPS_DIR)
 	dh_testdir
 	$(MAKE) -f debian/rules.gen build-$(DEB_HOST_ARCH)
 	touch $@
@@ -29,11 +31,11 @@
 
 binary:	binary-indep binary-arch
 
-CONTROL_FILES = debian/changelog $(wildcard debian/templates/control.*) 
+CONTROL_FILES += debian/changelog $(wildcard debian/templates/control.*) 
 CONTROL_FILES += $(wildcard debian/arch/defines) $(wildcard debian/arch/*/defines) $(wildcard debian/arch/*/*/defines)
 GENCONTROL = $(__MODULES_DIR)gencontrol.py
 debian/control debian/rules.gen: $(CONTROL_FILES)
-	if [ -f debian/control.md5sum ]; then \
+	if [ -f debian/control ] && [ -f debian/control.md5sum ] && [ -f debian/rules.gen ]; then \
 		if md5sum $^ | diff - debian/control.md5sum > /dev/null; then true; else \
 			$(MAKE) -f debian/rules debian/control-real; \
 		fi \
@@ -42,7 +44,7 @@
 	fi
 
 debian/control-real: $(CONTROL_FILES)
-	$(GENCONTROL)
+	$(GENCONTROL) $(__MODULES_DIR)..
 	md5sum $^ > debian/control.md5sum
 	@echo
 	@echo This target is made to fail intentionally, to make sure