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

[Bastian Blank]

Author: waldi
Date: Wed Oct 10 14:13:14 2007
New Revision: 9627

Log:
debian/modules/rules.include:
Use make instead of shell magic for control check.


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

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 Oct 10 14:13:14 2007
@@ -37,19 +37,15 @@
 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 ] && [ -f debian/control.md5sum ] && [ -f debian/rules.gen ]; then \
-		if [ "$(__BINNMU)" ]; then \
-			if ! grep -v debian/changelog debian/control.md5sum | md5sum --check - --status; then \
-				$(MAKE) -f debian/rules debian/control-real; \
-			fi \
-		else \
-			if ! md5sum --check debian/control.md5sum --status; then \
-				$(MAKE) -f debian/rules debian/control-real; \
-			fi \
-		fi \
-	else \
-		$(MAKE) -f debian/rules debian/control-real; \
-	fi
+ifeq ($(wildcard debian/control.md5sum),)
+	$(MAKE) -f debian/rules debian/control-real
+else ifeq ($(__BINNMU),)
+	md5sum --check debian/control.md5sum --status || \
+		$(MAKE) -f debian/rules debian/control-real
+else
+	grep -v debian/changelog debian/control.md5sum | md5sum --check - --status || \
+		$(MAKE) -f debian/rules debian/control-real
+endif
 
 debian/control-real: $(CONTROL_FILES)
 	$(GENCONTROL) $(__MODULES_DIR)..