[kernel] r6046 - people/waldi/linux-2.6/debian/modules

[Bastian Blank]

Author: waldi
Date: Fri Mar  3 16:30:54 2006
New Revision: 6046

Modified:
   people/waldi/linux-2.6/debian/modules/rules.include
Log:
debian/modules/rules.include: Use another variable name.


Modified: people/waldi/linux-2.6/debian/modules/rules.include
==============================================================================
--- people/waldi/linux-2.6/debian/modules/rules.include	(original)
+++ people/waldi/linux-2.6/debian/modules/rules.include	Fri Mar  3 16:30:54 2006
@@ -1,9 +1,9 @@
-DIR := $(dir $(lastword $(MAKEFILE_LIST)))
+__MODULES_DIR := $(dir $(lastword $(MAKEFILE_LIST)))
 
 DEB_HOST_ARCH  := $(shell dpkg-architecture -qDEB_HOST_ARCH)
 DEB_BUILD_ARCH := $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 
-include $(DIR)rules.defs
+include $(__MODULES_DIR)rules.defs
 
 build: debian/control $(STAMPS_DIR)/build-stamp
 $(STAMPS_DIR)/build-stamp: $(BUILD_DIR) $(STAMPS_DIR)
@@ -31,7 +31,7 @@
 
 CONTROL_FILES = debian/changelog $(wildcard debian/templates/control.*) 
 CONTROL_FILES += debian/arch/defines $(wildcard debian/arch/*/defines) $(wildcard debian/arch/*/*/defines)
-debian/control debian/rules.gen: $(DIR)gencontrol.py $(CONTROL_FILES)
+debian/control debian/rules.gen: $(__MODULES_DIR)gencontrol.py $(CONTROL_FILES)
 	if [ -f debian/control.md5sum ]; then \
 		if md5sum $^ | diff - debian/control.md5sum > /dev/null; then true; else \
 			$(MAKE) -f debian/rules debian/control-real; \
@@ -40,7 +40,7 @@
 		$(MAKE) -f debian/rules debian/control-real; \
 	fi
 
-debian/control-real: $(DIR)gencontrol.py $(CONTROL_FILES)
+debian/control-real: $(__MODULES_DIR)gencontrol.py $(CONTROL_FILES)
 	$<
 	md5sum $^ > debian/control.md5sum
 	@echo