r786 - lvm2/trunk/debian

[Bastian Blank]

Author: waldi
Date: Tue Mar 16 21:33:42 2010
New Revision: 786

Log:
debian/rules: Factor out install preparation.

Modified:
   lvm2/trunk/debian/rules

Modified: lvm2/trunk/debian/rules
==============================================================================
--- lvm2/trunk/debian/rules	Tue Mar 16 21:28:56 2010	(r785)
+++ lvm2/trunk/debian/rules	Tue Mar 16 21:33:42 2010	(r786)
@@ -142,6 +142,12 @@
 	$(MAKE) -C $(BUILD_DIR)/build_udeb install_$* DESTDIR=$(CURDIR)/$(DIR) LIB_VERSION_DM=$(DEVMAPPER_ABINAME)
 	touch $@
 
+install-base-prep:
+	dh_testdir
+	dh_testroot
+	dh_prep
+	dh_install -X .svn --sourcedir=$(INSTALL_DIR)
+
 install-base:
 	dh_installchangelogs $(if $(CHANGELOG),$(CHANGELOG),WHATS_NEW)
 	dh_installdebconf
@@ -159,20 +165,14 @@
 install_clvm: export DH_OPTIONS = -pclvm
 install_clvm: DIR = $(BUILD_DIR)/install_deb_cluster
 install_clvm: $(STAMPS_DIR)/install_deb_cluster
-	dh_testdir
-	dh_testroot
-	dh_prep
-	dh_install --sourcedir=$(DIR)
+	+$(MAKE_SELF) install-base-prep INSTALL_DIR='$(DIR)'
 	dh_installinit --no-start -- start 63 S . start 51 0 6 .
 	+$(MAKE_SELF) install-base
 
 install_dmsetup: export DH_OPTIONS = -pdmsetup
 install_dmsetup: DIR = $(BUILD_DIR)/install_deb_device-mapper
 install_dmsetup: $(STAMPS_DIR)/install_deb_device-mapper
-	dh_testdir
-	dh_testroot
-	dh_prep
-	dh_install -X .svn --sourcedir=$(DIR)
+	+$(MAKE_SELF) install-base-prep INSTALL_DIR='$(DIR)'
 	+$(MAKE_SELF) install-base CHANGELOG=WHATS_NEW_DM GENCONTROL_ARGS="-v$(DEVMAPPER_VERSION_DEBIAN)"
 
 install_dmsetup-udeb: PACKAGE_NAME = dmsetup-udeb
@@ -180,11 +180,8 @@
 install_dmsetup-udeb: PACKAGE_FILE = $(PACKAGE_NAME)_$(DEVMAPPER_VERSION_FILE)_$(DEB_HOST_ARCH).udeb
 install_dmsetup-udeb: DIR = $(BUILD_DIR)/install_udeb_device-mapper
 install_dmsetup-udeb: $(STAMPS_DIR)/install_udeb_device-mapper
-	dh_testdir
-	dh_testroot
-	dh_prep
+	+$(MAKE_SELF) install-base-prep INSTALL_DIR='$(DIR)'
 	dh_installchangelogs
-	dh_install --sourcedir=$(DIR)
 
 	dh_installdocs
 	dh_strip
@@ -203,10 +200,7 @@
 install_libdevmapper: export DH_OPTIONS = -plibdevmapper-dev -plibdevmapper$(DEVMAPPER_ABINAME)
 install_libdevmapper: DIR = $(BUILD_DIR)/install_deb_device-mapper
 install_libdevmapper: $(STAMPS_DIR)/install_deb_device-mapper
-	dh_testdir
-	dh_testroot
-	dh_prep
-	dh_install --sourcedir=$(DIR)
+	+$(MAKE_SELF) install-base-prep INSTALL_DIR='$(DIR)'
 	dh_link -p libdevmapper-dev lib/libdevmapper.so.$(DEVMAPPER_ABINAME) usr/lib/libdevmapper.so
 	dh_makeshlibs -p 'libdevmapper$(DEVMAPPER_ABINAME)' \
 		--add-udeb 'libdevmapper$(DEVMAPPER_ABINAME)-udeb' \
@@ -219,10 +213,7 @@
 install_libdevmapper-udeb: PACKAGE_FILE = $(PACKAGE_NAME)_$(DEVMAPPER_VERSION_FILE)_$(DEB_HOST_ARCH).udeb
 install_libdevmapper-udeb: DIR = $(BUILD_DIR)/install_udeb_device-mapper
 install_libdevmapper-udeb: $(STAMPS_DIR)/install_udeb_device-mapper
-	dh_testdir
-	dh_testroot
-	dh_prep
-	dh_install --sourcedir=$(DIR)
+	+$(MAKE_SELF) install-base-prep INSTALL_DIR='$(DIR)'
 	dh_installchangelogs
 	dh_installexamples
 
@@ -242,20 +233,14 @@
 install_lvm2: export DH_OPTIONS = -plvm2
 install_lvm2: DIR = $(BUILD_DIR)/install_deb_lvm2
 install_lvm2: $(STAMPS_DIR)/install_deb_lvm2
-	dh_testdir
-	dh_testroot
-	dh_prep
-	dh_install -X .svn --sourcedir=$(DIR)
+	+$(MAKE_SELF) install-base-prep INSTALL_DIR='$(DIR)'
 	dh_installinit --no-start -- start 26 S . start 50 0 6 .
 	+$(MAKE_SELF) install-base
 
 install_lvm2-udeb: export DH_OPTIONS = -plvm2-udeb
 install_lvm2-udeb: DIR = $(BUILD_DIR)/install_udeb_lvm2
 install_lvm2-udeb: $(STAMPS_DIR)/install_udeb_lvm2
-	dh_testdir
-	dh_testroot
-	dh_prep
-	dh_install --sourcedir=$(DIR)
+	+$(MAKE_SELF) install-base-prep INSTALL_DIR='$(DIR)'
 	+$(MAKE_SELF) install-base
 
 binary-indep: