r794 - lvm2/trunk/debian

[Bastian Blank]

Author: waldi
Date: Tue Mar 16 22:22:42 2010
New Revision: 794

Log:
debian/rules: Split off libdevmapper-dev build.

Modified:
   lvm2/trunk/debian/rules

Modified: lvm2/trunk/debian/rules
==============================================================================
--- lvm2/trunk/debian/rules	Tue Mar 16 22:13:37 2010	(r793)
+++ lvm2/trunk/debian/rules	Tue Mar 16 22:22:42 2010	(r794)
@@ -172,17 +172,23 @@
 		BUILDDEB_ARGS="--filename=$(PACKAGE_FILE)" \
 		GENCONTROL_ARGS="-v$(DEVMAPPER_VERSION_DEBIAN)"
 
-install_libdevmapper: export DH_OPTIONS = -plibdevmapper-dev -plibdevmapper$(DEVMAPPER_ABINAME)
+install_libdevmapper: export DH_OPTIONS = -plibdevmapper$(DEVMAPPER_ABINAME)
 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)' \
+	dh_makeshlibs \
 		--add-udeb 'libdevmapper$(DEVMAPPER_ABINAME)-udeb' \
 	       	"-Vlibdevmapper$(DEVMAPPER_ABINAME) (>= $(DEVMAPPER_VERSION))" \
 		-- "-v$(DEVMAPPER_VERSION_DEBIAN)" -c2
 	+$(MAKE_SELF) install-base CHANGELOG=WHATS_NEW_DM GENCONTROL_ARGS="-v$(DEVMAPPER_VERSION_DEBIAN)"
 
+install_libdevmapper-dev: export DH_OPTIONS = -plibdevmapper-dev
+install_libdevmapper-dev: DIR = $(BUILD_DIR)/install_deb
+install_libdevmapper-dev: $(STAMPS_DIR)/install_deb
+	+$(MAKE_SELF) install-base-prep INSTALL_DIR='$(DIR)'
+	dh_link lib/libdevmapper.so.$(DEVMAPPER_ABINAME) usr/lib/libdevmapper.so
+	+$(MAKE_SELF) install-base CHANGELOG=WHATS_NEW_DM GENCONTROL_ARGS="-v$(DEVMAPPER_VERSION_DEBIAN)"
+
 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
@@ -207,7 +213,7 @@
 	+$(MAKE_SELF) install-base
 
 binary-indep:
-binary-arch: $(addprefix install_,libdevmapper libdevmapper-udeb dmsetup dmsetup-udeb lvm2 lvm2-udeb clvm)
+binary-arch: $(addprefix install_,libdevmapper libdevmapper-udeb libdevmapper-dev dmsetup dmsetup-udeb lvm2 lvm2-udeb clvm)
 
 binary: binary-indep binary-arch