r878 - lvm2/trunk/debian

[Bastian Blank]

Author: waldi
Date: Thu Oct 20 17:51:25 2011
New Revision: 878

Log:
debian/rules: Merge some identical install rules.

Modified:
   lvm2/trunk/debian/rules

Modified: lvm2/trunk/debian/rules
==============================================================================
--- lvm2/trunk/debian/rules	Thu Oct 20 17:43:18 2011	(r877)
+++ lvm2/trunk/debian/rules	Thu Oct 20 17:51:25 2011	(r878)
@@ -200,26 +200,13 @@
 		BUILDDEB_ARGS="--filename=$(PACKAGE_FILE)" \
 		GENCONTROL_ARGS="-v$(DEVMAPPER_VERSION_DEBIAN)"
 
-install_liblvm2app: export DH_OPTIONS = -pliblvm2app$(LVM2APP_ABINAME)
-install_liblvm2app: DIR = $(BUILD_DIR)/install_deb
-install_liblvm2app: $(STAMPS_DIR)/install_deb
+install_liblvm2: export DH_OPTIONS = -pliblvm2app$(LVM2APP_ABINAME) -pliblvm2cmd$(LVM2CMD_ABINAME) -pliblvm2-dev
+install_liblvm2: DIR = $(BUILD_DIR)/install_deb
+install_liblvm2: $(STAMPS_DIR)/install_deb
 	+$(MAKE_SELF) install-base-prep INSTALL_DIR='$(DIR)'
 	dh_makeshlibs -V -- -c2
 	+$(MAKE_SELF) install-base
 
-install_liblvm2cmd: export DH_OPTIONS = -pliblvm2cmd$(LVM2CMD_ABINAME)
-install_liblvm2cmd: DIR = $(BUILD_DIR)/install_deb
-install_liblvm2cmd: $(STAMPS_DIR)/install_deb
-	+$(MAKE_SELF) install-base-prep INSTALL_DIR='$(DIR)'
-	dh_makeshlibs -V -- -c2
-	+$(MAKE_SELF) install-base
-
-install_liblvm2-dev: export DH_OPTIONS = -pliblvm2-dev
-install_liblvm2-dev: DIR = $(BUILD_DIR)/install_deb
-install_liblvm2-dev: $(STAMPS_DIR)/install_deb
-	+$(MAKE_SELF) install-base-prep INSTALL_DIR='$(DIR)'
-	+$(MAKE_SELF) install-base
-
 install_lvm2: export DH_OPTIONS = -plvm2
 install_lvm2: DIR = $(BUILD_DIR)/install_deb
 install_lvm2: $(STAMPS_DIR)/install_deb
@@ -234,7 +221,7 @@
 	+$(MAKE_SELF) install-base
 
 binary-indep:
-binary-arch: $(addprefix install_,libdevmapper libdevmapper-udeb libdevmapper-dev dmsetup dmsetup-udeb liblvm2app liblvm2cmd liblvm2-dev lvm2 lvm2-udeb clvm)
+binary-arch: $(addprefix install_,libdevmapper libdevmapper-udeb libdevmapper-dev dmsetup dmsetup-udeb liblvm2 lvm2 lvm2-udeb clvm)
 
 binary: binary-indep binary-arch