r773 - lvm2/trunk/debian

Bastian Blank waldi at alioth.debian.org
Tue Mar 16 19:53:33 UTC 2010


Author: waldi
Date: Tue Mar 16 19:53:32 2010
New Revision: 773

Log:
debian/rules: Update.

Modified:
   lvm2/trunk/debian/rules

Modified: lvm2/trunk/debian/rules
==============================================================================
--- lvm2/trunk/debian/rules	Tue Mar 16 19:44:07 2010	(r772)
+++ lvm2/trunk/debian/rules	Tue Mar 16 19:53:32 2010	(r773)
@@ -49,16 +49,25 @@
 	QUILT_PATCHES=$(CURDIR)/debian/patches quilt --quiltrc /dev/null push -a || test $$? = 2
 	touch $@
 
-setup: $(STAMPS_DIR)/setup-deb $(STAMPS_DIR)/setup-udeb
+source: $(STAMPS_DIR)/source
 
-$(STAMPS_DIR)/setup-deb: SOURCE_FILES = $(filter-out debian, $(wildcard * .[^.]*))
-$(STAMPS_DIR)/setup-deb: DIR = $(BUILD_DIR)/build-deb
-$(STAMPS_DIR)/setup-deb: $(STAMPS_DIR)/patch
+$(STAMPS_DIR)/source: SOURCE_FILES = $(filter-out debian .svn, $(wildcard * .[^.]*))
+$(STAMPS_DIR)/source: DIR = $(BUILD_DIR)/source
+$(STAMPS_DIR)/source: $(STAMPS_DIR)/patch
 	rm -rf $(DIR)
 	mkdir -p '$(DIR)'
 	cp -a $(SOURCE_FILES) '$(DIR)'
+	cd $(DIR); autoreconf
+	touch $@
+
+setup: $(STAMPS_DIR)/setup_deb $(STAMPS_DIR)/setup_udeb
+
+$(STAMPS_DIR)/setup_deb: SOURCE_DIR = $(BUILD_DIR)/source
+$(STAMPS_DIR)/setup_deb: DIR = $(BUILD_DIR)/build_deb
+$(STAMPS_DIR)/setup_deb: $(STAMPS_DIR)/source
+	rm -rf $(DIR)
+	cp -a '$(SOURCE_DIR)' '$(DIR)'
 	cd $(DIR); \
-	autoreconf; \
 	./configure CFLAGS="$(CFLAGS)" \
 		$(CONFIGURE_FLAGS) \
 		--with-optimisation="" \
@@ -70,14 +79,12 @@
 		--enable-readline
 	touch $@
 
-$(STAMPS_DIR)/setup-udeb: SOURCE_FILES = $(filter-out debian, $(wildcard * .[^.]*))
-$(STAMPS_DIR)/setup-udeb: DIR = $(BUILD_DIR)/build-udeb
-$(STAMPS_DIR)/setup-udeb: $(STAMPS_DIR)/patch
+$(STAMPS_DIR)/setup_udeb: SOURCE_DIR = $(BUILD_DIR)/source
+$(STAMPS_DIR)/setup_udeb: DIR = $(BUILD_DIR)/build_udeb
+$(STAMPS_DIR)/setup_udeb: $(STAMPS_DIR)/patch
 	rm -rf $(DIR)
-	mkdir -p '$(DIR)'
-	cp -a $(SOURCE_FILES) '$(DIR)'
+	cp -a '$(SOURCE_DIR)' '$(DIR)'
 	cd $(DIR); \
-	autoreconf; \
 	./configure CFLAGS="$(CFLAGS_UDEB)" \
 		$(CONFIGURE_FLAGS) \
 		--with-optimisation="" \
@@ -88,20 +95,20 @@
 		--disable-selinux
 	touch $@
 
-build: $(STAMPS_DIR)/build-deb $(STAMPS_DIR)/build-udeb
+build: $(STAMPS_DIR)/build_deb $(STAMPS_DIR)/build_udeb
 
-build-deb: $(STAMPS_DIR)/build-deb
-.NOTPARALLEL: $(STAMPS_DIR)/build-deb
-$(STAMPS_DIR)/build-deb: DIR = $(BUILD_DIR)/build-deb
-$(STAMPS_DIR)/build-deb: $(STAMPS_DIR)/setup-deb
+build_deb: $(STAMPS_DIR)/build_deb
+.NOTPARALLEL: $(STAMPS_DIR)/build_deb
+$(STAMPS_DIR)/build_deb: DIR = $(BUILD_DIR)/build_deb
+$(STAMPS_DIR)/build_deb: $(STAMPS_DIR)/setup_deb
 	dh_testdir
 	$(MAKE) -C $(DIR) LIB_VERSION_DM=$(DEVMAPPER_ABINAME)
 	touch $@
 
-build-udeb: $(STAMPS_DIR)/build-udeb
-.NOTPARALLEL: $(STAMPS_DIR)/build-udeb
-$(STAMPS_DIR)/build-udeb: DIR = $(BUILD_DIR)/build-udeb
-$(STAMPS_DIR)/build-udeb: $(STAMPS_DIR)/setup-udeb
+build_udeb: $(STAMPS_DIR)/build_udeb
+.NOTPARALLEL: $(STAMPS_DIR)/build_udeb
+$(STAMPS_DIR)/build_udeb: DIR = $(BUILD_DIR)/build_udeb
+$(STAMPS_DIR)/build_udeb: $(STAMPS_DIR)/setup_udeb
 	dh_testdir
 	$(MAKE) -C $(DIR) LIB_VERSION_DM=$(DEVMAPPER_ABINAME)
 	touch $@
@@ -117,20 +124,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: $(addprefix install-,libdevmapper libdevmapper-udeb dmsetup dmsetup-udeb lvm2 lvm2-udeb clvm)
@@ -147,8 +154,8 @@
 	dh_builddeb
 
 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_cluster
+install-clvm: $(STAMPS_DIR)/install_deb_cluster
 	dh_testdir
 	dh_testroot
 	dh_clean -k
@@ -159,8 +166,8 @@
 	$(MAKE) -f debian/rules 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_device-mapper
+install-dmsetup: $(STAMPS_DIR)/install_deb_device-mapper
 	dh_testdir
 	dh_testroot
 	dh_clean -k
@@ -175,8 +182,8 @@
 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_device-mapper
+install-dmsetup-udeb: $(STAMPS_DIR)/install_udeb_device-mapper
 	dh_testdir
 	dh_testroot
 	dh_clean -k
@@ -198,8 +205,8 @@
 
 
 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_device-mapper
+install-libdevmapper: $(STAMPS_DIR)/install_deb_device-mapper
 	dh_testdir
 	dh_testroot
 	dh_clean -k
@@ -216,8 +223,8 @@
 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_device-mapper
+install-libdevmapper-udeb: $(STAMPS_DIR)/install_udeb_device-mapper
 	dh_testdir
 	dh_testroot
 	dh_clean -k
@@ -239,8 +246,8 @@
 	dpkg-deb --build debian/$(PACKAGE_NAME) ../$(PACKAGE_FILE)
 
 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_lvm2
+install-lvm2: $(STAMPS_DIR)/install_deb_lvm2
 	dh_testdir
 	dh_testroot
 	dh_clean -k
@@ -255,8 +262,8 @@
 	$(MAKE) -f debian/rules 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_lvm2
+install-lvm2-udeb: $(STAMPS_DIR)/install_udeb_lvm2
 	dh_testdir
 	dh_testroot
 	dh_clean -k



More information about the pkg-lvm-commits mailing list