[kernel] r9626 - dists/trunk/linux-2.6/debian

Bastian Blank waldi at alioth.debian.org
Wed Oct 10 14:08:22 UTC 2007


Author: waldi
Date: Wed Oct 10 14:08:21 2007
New Revision: 9626

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


Modified:
   dists/trunk/linux-2.6/debian/rules

Modified: dists/trunk/linux-2.6/debian/rules
==============================================================================
--- dists/trunk/linux-2.6/debian/rules	(original)
+++ dists/trunk/linux-2.6/debian/rules	Wed Oct 10 14:08:21 2007
@@ -74,19 +74,15 @@
 CONTROL_FILES = debian/changelog $(wildcard debian/templates/*.in)
 CONTROL_FILES += debian/config/defines $(wildcard debian/config/*/defines) $(wildcard debian/config/*/*/defines)
 debian/control debian/rules.gen: debian/bin/gencontrol.py $(CONTROL_FILES)
-	if [ -f debian/control.md5sum ]; then \
-		if [ "$(VERSION_DEBIAN_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 ($(VERSION_DEBIAN_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: debian/bin/gencontrol.py $(CONTROL_FILES)
 	chmod +x $<



More information about the Kernel-svn-changes mailing list