r792 - lvm2/trunk/debian

[Bastian Blank]

Author: waldi
Date: Tue Mar 16 22:08:49 2010
New Revision: 792

Log:
debian/rules: Merge install rules.

Modified:
   lvm2/trunk/debian/rules

Modified: lvm2/trunk/debian/rules
==============================================================================
--- lvm2/trunk/debian/rules	Tue Mar 16 22:04:55 2010	(r791)
+++ lvm2/trunk/debian/rules	Tue Mar 16 22:08:49 2010	(r792)
@@ -120,20 +120,13 @@
 	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_%: DIR = $(BUILD_DIR)/build_$*
+$(STAMPS_DIR)/install_%: INSTALL_DIR = $(BUILD_DIR)/install_$*
+$(STAMPS_DIR)/install_%: $(STAMPS_DIR)/build_%
 	dh_testdir
 	dh_testroot
-	rm -rf $(DIR)
-	$(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
-	dh_testdir
-	dh_testroot
-	rm -rf $(DIR)
-	$(MAKE) -C $(BUILD_DIR)/build_udeb install DESTDIR=$(CURDIR)/$(DIR) LIB_VERSION_DM=$(DEVMAPPER_ABINAME)
+	rm -rf $(INSTALL_DIR)
+	$(MAKE) -C $(DIR) install DESTDIR=$(CURDIR)/$(INSTALL_DIR) LIB_VERSION_DM=$(DEVMAPPER_ABINAME)
 	touch $@
 
 install-base-prep: