r597 - lvm2/trunk/debian

[Bastian Blank]

Author: waldi
Date: Tue Jul 15 18:00:54 2008
New Revision: 597

Log:
debian/rules: Install anything into debian/build.


Modified:
   lvm2/trunk/debian/rules

Modified: lvm2/trunk/debian/rules
==============================================================================
--- lvm2/trunk/debian/rules	(original)
+++ lvm2/trunk/debian/rules	Tue Jul 15 18:00:54 2008
@@ -122,23 +122,25 @@
 
 install-clvm: export DH_OPTIONS = -pclvm
 install-clvm: DIR = $(BUILD_DIR)/build-deb
+install-clvm: INSTALL_DIR = $(BUILD_DIR)/install-deb
 install-clvm: $(STAMPS_DIR)/build-deb
 	dh_testdir
 	dh_testroot
 	dh_clean -k
-	$(MAKE) -C $(DIR) install DESTDIR=$(CURDIR)/debian/tmp
-	dh_install --sourcedir=debian/tmp
+	$(MAKE) -C $(DIR) install DESTDIR=$(CURDIR)/$(INSTALL_DIR)
+	dh_install --sourcedir=$(INSTALL_DIR)
 	dh_installexamples
 	$(MAKE) -f debian/rules install-base
 
 install-lvm2: export DH_OPTIONS = -plvm2
 install-lvm2: DIR = $(BUILD_DIR)/build-deb
+install-lvm2: INSTALL_DIR = $(BUILD_DIR)/install-deb
 install-lvm2: $(STAMPS_DIR)/build-deb
 	dh_testdir
 	dh_testroot
 	dh_clean -k
-	$(MAKE) -C $(DIR) install DESTDIR=$(CURDIR)/debian/tmp
-	dh_install --sourcedir=debian/tmp
+	$(MAKE) -C $(DIR) install DESTDIR=$(CURDIR)/$(INSTALL_DIR)
+	dh_install --sourcedir=$(INSTALL_DIR)
 	cp -a debian/initramfs-tools debian/lvm2/usr/share
 	chmod +x -R debian/lvm2/usr/share/initramfs-tools
 	dh_installdebconf
@@ -148,12 +150,13 @@
 
 install-lvm2-udeb: export DH_OPTIONS = -plvm2-udeb
 install-lvm2-udeb: DIR = $(BUILD_DIR)/build-udeb
+install-lvm2-udeb: INSTALL_DIR = $(BUILD_DIR)/install-udeb
 install-lvm2-udeb: $(STAMPS_DIR)/build-udeb
 	dh_testdir
 	dh_testroot
 	dh_clean -k
-	$(MAKE) -C $(DIR) install DESTDIR=$(CURDIR)/debian/tmp
-	dh_install --sourcedir=debian/tmp
+	$(MAKE) -C $(DIR) install DESTDIR=$(CURDIR)/$(INSTALL_DIR)
+	dh_install --sourcedir=$(INSTALL_DIR)
 	$(MAKE) -f debian/rules install-base
 
 binary-indep: