r791 - lvm2/trunk/debian

[Bastian Blank]

Author: waldi
Date: Tue Mar 16 22:04:55 2010
New Revision: 791

Log:
debian/rules: Install only once per type.

Modified:
   lvm2/trunk/debian/rules

Modified: lvm2/trunk/debian/rules
==============================================================================
--- lvm2/trunk/debian/rules	Tue Mar 16 21:59:14 2010	(r790)
+++ lvm2/trunk/debian/rules	Tue Mar 16 22:04:55 2010	(r791)
@@ -120,20 +120,20 @@
 	rm -rf $(BUILD_DIR) $(STAMPS_DIR)
 	dh_clean
 
-$(STAMPS_DIR)/install_deb_%: DIR = $(BUILD_DIR)/install_deb_$*
-$(STAMPS_DIR)/install_deb_%: $(STAMPS_DIR)/build_deb
+$(STAMPS_DIR)/install_deb: DIR = $(BUILD_DIR)/install_deb
+$(STAMPS_DIR)/install_deb: $(STAMPS_DIR)/build_deb
 	dh_testdir
 	dh_testroot
 	rm -rf $(DIR)
-	$(MAKE) -C $(BUILD_DIR)/build_deb install_$* DESTDIR=$(CURDIR)/$(DIR) LIB_VERSION_DM=$(DEVMAPPER_ABINAME)
+	$(MAKE) -C $(BUILD_DIR)/build_deb install DESTDIR=$(CURDIR)/$(DIR) LIB_VERSION_DM=$(DEVMAPPER_ABINAME)
 	touch $@
 
-$(STAMPS_DIR)/install_udeb_%: DIR = $(BUILD_DIR)/install_udeb_$*
-$(STAMPS_DIR)/install_udeb_%: $(STAMPS_DIR)/build_udeb
+$(STAMPS_DIR)/install_udeb: DIR = $(BUILD_DIR)/install_udeb
+$(STAMPS_DIR)/install_udeb: $(STAMPS_DIR)/build_udeb
 	dh_testdir
 	dh_testroot
 	rm -rf $(DIR)
-	$(MAKE) -C $(BUILD_DIR)/build_udeb install_$* DESTDIR=$(CURDIR)/$(DIR) LIB_VERSION_DM=$(DEVMAPPER_ABINAME)
+	$(MAKE) -C $(BUILD_DIR)/build_udeb install DESTDIR=$(CURDIR)/$(DIR) LIB_VERSION_DM=$(DEVMAPPER_ABINAME)
 	touch $@
 
 install-base-prep:
@@ -157,31 +157,31 @@
 	dh_builddeb $(BUILDDEB_ARGS)
 
 install_clvm: export DH_OPTIONS = -pclvm
-install_clvm: DIR = $(BUILD_DIR)/install_deb_cluster
-install_clvm: $(STAMPS_DIR)/install_deb_cluster
+install_clvm: DIR = $(BUILD_DIR)/install_deb
+install_clvm: $(STAMPS_DIR)/install_deb
 	+$(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
+install_dmsetup: DIR = $(BUILD_DIR)/install_deb
+install_dmsetup: $(STAMPS_DIR)/install_deb
 	+$(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
 install_dmsetup-udeb: export DH_OPTIONS = -p$(PACKAGE_NAME)
 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
+install_dmsetup-udeb: DIR = $(BUILD_DIR)/install_udeb
+install_dmsetup-udeb: $(STAMPS_DIR)/install_udeb
 	+$(MAKE_SELF) install-base-prep INSTALL_DIR='$(DIR)'
 	+$(MAKE_SELF) install-base \
 		BUILDDEB_ARGS="--filename=$(PACKAGE_FILE)" \
 		GENCONTROL_ARGS="-v$(DEVMAPPER_VERSION_DEBIAN)"
 
 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
+install_libdevmapper: DIR = $(BUILD_DIR)/install_deb
+install_libdevmapper: $(STAMPS_DIR)/install_deb
 	+$(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)' \
@@ -193,23 +193,23 @@
 install_libdevmapper-udeb: PACKAGE_NAME = libdevmapper$(DEVMAPPER_ABINAME)-udeb
 install_libdevmapper-udeb: export DH_OPTIONS = -p$(PACKAGE_NAME)
 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
+install_libdevmapper-udeb: DIR = $(BUILD_DIR)/install_udeb
+install_libdevmapper-udeb: $(STAMPS_DIR)/install_udeb
 	+$(MAKE_SELF) install-base-prep INSTALL_DIR='$(DIR)'
 	+$(MAKE_SELF) install-base \
 		BUILDDEB_ARGS="--filename=$(PACKAGE_FILE)" \
 		GENCONTROL_ARGS="-v$(DEVMAPPER_VERSION_DEBIAN)"
 
 install_lvm2: export DH_OPTIONS = -plvm2
-install_lvm2: DIR = $(BUILD_DIR)/install_deb_lvm2
-install_lvm2: $(STAMPS_DIR)/install_deb_lvm2
+install_lvm2: DIR = $(BUILD_DIR)/install_deb
+install_lvm2: $(STAMPS_DIR)/install_deb
 	+$(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
+install_lvm2-udeb: DIR = $(BUILD_DIR)/install_udeb
+install_lvm2-udeb: $(STAMPS_DIR)/install_udeb
 	+$(MAKE_SELF) install-base-prep INSTALL_DIR='$(DIR)'
 	+$(MAKE_SELF) install-base