r785 - lvm2/trunk/debian

[Bastian Blank]

Author: waldi
Date: Tue Mar 16 21:28:56 2010
New Revision: 785

Log:
debian/rules: Make recursive calls easier.

Modified:
   lvm2/trunk/debian/rules

Modified: lvm2/trunk/debian/rules
==============================================================================
--- lvm2/trunk/debian/rules	Tue Mar 16 21:25:54 2010	(r784)
+++ lvm2/trunk/debian/rules	Tue Mar 16 21:28:56 2010	(r785)
@@ -18,6 +18,8 @@
 DEVMAPPER_VERSION_DEBIAN = $(DEVMAPPER_VERSION)-$(VERSION_DEBIAN)
 DEVMAPPER_VERSION_FILE = $(DEVMAPPER_VERSION_PLAIN)-$(VERSION_DEBIAN)
 
+MAKE_SELF = $(MAKE) -f debian/rules
+
 BUILD_DIR = debian/build
 STAMPS_DIR = debian/stamps
 
@@ -162,7 +164,7 @@
 	dh_prep
 	dh_install --sourcedir=$(DIR)
 	dh_installinit --no-start -- start 63 S . start 51 0 6 .
-	$(MAKE) -f debian/rules install-base
+	+$(MAKE_SELF) install-base
 
 install_dmsetup: export DH_OPTIONS = -pdmsetup
 install_dmsetup: DIR = $(BUILD_DIR)/install_deb_device-mapper
@@ -171,7 +173,7 @@
 	dh_testroot
 	dh_prep
 	dh_install -X .svn --sourcedir=$(DIR)
-	$(MAKE) -f debian/rules install-base CHANGELOG=WHATS_NEW_DM GENCONTROL_ARGS="-v$(DEVMAPPER_VERSION_DEBIAN)"
+	+$(MAKE_SELF) install-base CHANGELOG=WHATS_NEW_DM GENCONTROL_ARGS="-v$(DEVMAPPER_VERSION_DEBIAN)"
 
 install_dmsetup-udeb: PACKAGE_NAME = dmsetup-udeb
 install_dmsetup-udeb: export DH_OPTIONS = -p$(PACKAGE_NAME)
@@ -210,7 +212,7 @@
 		--add-udeb 'libdevmapper$(DEVMAPPER_ABINAME)-udeb' \
 	       	"-Vlibdevmapper$(DEVMAPPER_ABINAME) (>= $(DEVMAPPER_VERSION))" \
 		-- "-v$(DEVMAPPER_VERSION_DEBIAN)" -c2
-	$(MAKE) -f debian/rules install-base CHANGELOG=WHATS_NEW_DM GENCONTROL_ARGS="-v$(DEVMAPPER_VERSION_DEBIAN)"
+	+$(MAKE_SELF) install-base CHANGELOG=WHATS_NEW_DM GENCONTROL_ARGS="-v$(DEVMAPPER_VERSION_DEBIAN)"
 
 install_libdevmapper-udeb: PACKAGE_NAME = libdevmapper$(DEVMAPPER_ABINAME)-udeb
 install_libdevmapper-udeb: export DH_OPTIONS = -p$(PACKAGE_NAME)
@@ -245,7 +247,7 @@
 	dh_prep
 	dh_install -X .svn --sourcedir=$(DIR)
 	dh_installinit --no-start -- start 26 S . start 50 0 6 .
-	$(MAKE) -f debian/rules install-base
+	+$(MAKE_SELF) install-base
 
 install_lvm2-udeb: export DH_OPTIONS = -plvm2-udeb
 install_lvm2-udeb: DIR = $(BUILD_DIR)/install_udeb_lvm2
@@ -254,7 +256,7 @@
 	dh_testroot
 	dh_prep
 	dh_install --sourcedir=$(DIR)
-	$(MAKE) -f debian/rules install-base
+	+$(MAKE_SELF) install-base
 
 binary-indep:
 binary-arch: $(addprefix install_,libdevmapper libdevmapper-udeb dmsetup dmsetup-udeb lvm2 lvm2-udeb clvm)