r526 - lvm2/trunk/debian

Bastian Blank waldi at alioth.debian.org
Tue Jan 8 16:17:05 UTC 2008 

Author: waldi
Date: Tue Jan  8 16:17:05 2008
New Revision: 526

Log:
debian/rules: Update.


Modified:
   lvm2/trunk/debian/rules

Modified: lvm2/trunk/debian/rules
==============================================================================
--- lvm2/trunk/debian/rules	(original)
+++ lvm2/trunk/debian/rules	Tue Jan  8 16:17:05 2008
@@ -18,8 +18,18 @@
 INSTALL_PROGRAM += -s
 endif
 
-CONFIGURE_FLAGS = \
-	--host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
+BUILD_DIR = debian/build
+STAMPS_DIR = debian/stamps
+
+PACKAGES_DEB = lvm2
+PACKAGES_UDEB = lvm2-udeb
+
+CONFIGURE_FLAGS = --build $(DEB_BUILD_GNU_TYPE)
+ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
+CONFIGURE_FLAGS += --host $(DEB_HOST_GNU_TYPE)
+endif
+
+CONFIGURE_FLAGS += \
 	--prefix=/usr \
 	--exec-prefix= \
 	--mandir=\$${prefix}/share/man \
@@ -30,128 +40,108 @@
 CONFIGURE_FLAGS += --disable-o_direct
 endif
 
-BUILD_DIR = debian/build
-
-PACKAGES_DEB = lvm2
-PACKAGES_UDEB = lvm2-udeb
-
-$(BUILD_DIR)/build-deb/config.status: DIR = $(BUILD_DIR)/build-deb
-$(BUILD_DIR)/build-deb/config.status:
-	dh_testdir
+setup: $(STAMPS_DIR)/setup
+$(STAMPS_DIR)/setup: $(BUILD_DIR) $(STAMPS_DIR) $(STAMPS_DIR)/setup-deb $(STAMPS_DIR)/setup-udeb
 
+$(STAMPS_DIR)/setup-deb: DIR = $(BUILD_DIR)/build-deb
+$(STAMPS_DIR)/setup-deb:
 	rm -rf $(DIR)
 	mkdir -p $(DIR)
 	cp -al $(filter-out debian, $(wildcard *)) $(DIR)
 	cp --remove-destination /usr/share/misc/config.sub /usr/share/misc/config.guess $(DIR)/autoconf
+	cd $(DIR); QUILT_PATCHES=$(CURDIR)/debian/patches quilt --quiltrc /dev/null push -a || test $$? = 2
 	cd $(DIR); \
-	./configure CFLAGS="$(CFLAGS)" $(CONFIGURE_FLAGS) \
+	./configure CFLAGS="$(CFLAGS)" \
+		$(CONFIGURE_FLAGS) \
 		--with-cluster=none \
 		--enable-readline
+	touch $@
 
-$(BUILD_DIR)/build-udeb/config.status: DIR = $(BUILD_DIR)/build-udeb
-$(BUILD_DIR)/build-udeb/config.status:
-	dh_testdir
-
+$(STAMPS_DIR)/setup-udeb: DIR = $(BUILD_DIR)/build-udeb
+$(STAMPS_DIR)/setup-udeb:
 	rm -rf $(DIR)
 	mkdir -p $(DIR)
 	cp -al $(filter-out debian, $(wildcard *)) $(DIR)
 	cp --remove-destination /usr/share/misc/config.sub /usr/share/misc/config.guess $(DIR)/autoconf
+	cd $(DIR); QUILT_PATCHES=$(CURDIR)/debian/patches quilt --quiltrc /dev/null push -a || test $$? = 2
 	cd $(DIR); \
-	./configure CFLAGS="$(CFLAGS)" $(CONFIGURE_FLAGS) \
+	./configure CFLAGS="$(CFLAGS)" \
+		$(CONFIGURE_FLAGS) \
 		--with-optimisation="-Os" \
 		--with-cluster=none \
 		--with-pool=none \
 		--disable-selinux
+	touch $@
 
-build: build-deb build-udeb
+build: $(STAMPS_DIR)/build
+$(STAMPS_DIR)/build: $(STAMPS_DIR)/setup $(STAMPS_DIR)/build-deb $(STAMPS_DIR)/build-udeb
 
-build-deb: $(BUILD_DIR)/build-deb-stamp
-$(BUILD_DIR)/build-deb-stamp: DIR = $(BUILD_DIR)/build-deb
-$(BUILD_DIR)/build-deb-stamp: $(BUILD_DIR)/build-deb/config.status
+build-deb: $(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)
-
 	touch $@
 
-build-udeb: $(BUILD_DIR)/build-udeb-stamp
-$(BUILD_DIR)/build-udeb-stamp: DIR = $(BUILD_DIR)/build-udeb
-$(BUILD_DIR)/build-udeb-stamp: $(BUILD_DIR)/build-udeb/config.status
+build-udeb: $(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)
-
 	touch $@
 
+$(BUILD_DIR) $(STAMPS_DIR):
+	@[ -d $@ ] || mkdir $@
+
 maintainerclean:
 	rm -rf $(filter-out .svn .svk debian, $(wildcard * .[^.]*))
 
 clean:
 	dh_testdir
-	rm -rf $(BUILD_DIR)
+	rm -rf $(BUILD_DIR) $(STAMPS_DIR)
 	dh_clean
 
-install: install-deb install-udeb
+install: $(addprefix install-, $(PACKAGES_DEB) $(PACKAGES_UDEB))
 
-install-deb: DH_OPTIONS = $(addprefix -p,$(PACKAGES_DEB))
-install-deb: DIR = $(BUILD_DIR)/build-deb
-install-deb: INSTALL_DIR = $(BUILD_DIR)/install-deb
-install-deb: build-deb
+install-base:
+	dh_installchangelogs WHATS_NEW
+	dh_installdocs
+	dh_strip
+	dh_compress
+	dh_fixperms
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+install-lvm2: export DH_OPTIONS = -plvm2
+install-lvm2: DIR = $(BUILD_DIR)/build-deb
+install-lvm2: $(STAMPS_DIR)/build-deb
 	dh_testdir
 	dh_testroot
-	dh_clean -k $(DH_OPTIONS)
-
-	rm -rf $(INSTALL_DIR)
-	$(MAKE) -C $(DIR) install DESTDIR=$(CURDIR)/$(INSTALL_DIR)
-
-	dh_install $(DH_OPTIONS) --sourcedir=$(INSTALL_DIR)
+	dh_clean -k
+	$(MAKE) -C $(DIR) install DESTDIR=$(CURDIR)/debian/tmp
+	dh_install --sourcedir=debian/tmp
 	cp -a debian/initramfs-tools debian/lvm2/usr/share
 	chmod +x -R debian/lvm2/usr/share/initramfs-tools
-
-install-udeb: DH_OPTIONS = $(addprefix -p,$(PACKAGES_UDEB))
-install-udeb: DIR = $(BUILD_DIR)/build-udeb
-install-udeb: INSTALL_DIR = $(BUILD_DIR)/install-udeb
-install-udeb: build-udeb
+	dh_installdebconf
+	dh_installexamples
+	dh_installinit --no-start -- start 26 S . start 50 0 6 .
+	$(MAKE) -f debian/rules install-base
+
+install-lvm2-udeb: export DH_OPTIONS = -plvm2-udeb
+install-lvm2-udeb: DIR = $(BUILD_DIR)/build-udeb
+install-lvm2-udeb: $(STAMPS_DIR)/build-udeb
 	dh_testdir
 	dh_testroot
-	dh_clean -k $(DH_OPTIONS)
+	dh_clean -k
+	$(MAKE) -C $(DIR) install DESTDIR=$(CURDIR)/debian/tmp
+	dh_install --sourcedir=debian/tmp
+	$(MAKE) -f debian/rules install-base
 
-	rm -rf $(INSTALL_DIR)
-	$(MAKE) -C $(DIR) install DESTDIR=$(CURDIR)/$(INSTALL_DIR)
-
-	dh_install $(DH_OPTIONS) --sourcedir=$(INSTALL_DIR)
-
-# Build architecture-independent files here.
 binary-indep:
-
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir -a
-	dh_testroot -a
-	dh_installdebconf -a
-	dh_installdocs -a
-	dh_installexamples -a
-#	dh_installmenu -a
-#	dh_installlogrotate -a
-#	dh_installemacsen -a
-#	dh_installpam -a
-#	dh_installmime -a
-	dh_installinit -plvm2 --no-start -- start 26 S . start 50 0 6 .
-#	dh_installcron -a
-#	dh_installman -a
-#	dh_installinfo -a
-#	dh_undocumented -a
-	dh_installchangelogs WHATS_NEW -a
-	dh_strip -a
-	dh_link -a
-	dh_compress -a
-	dh_fixperms -a
-	dh_makeshlibs -a -n
-	dh_installdeb -a
-	dh_shlibdeps -a
-	dh_gencontrol -a
-	dh_md5sums -a
-	dh_builddeb -a
+binary-arch: install
 
 binary: binary-indep binary-arch

More information about the pkg-lvm-commits mailing list