r13904 - /packages/unstable/libcm/debian/rules

[lool at users.alioth.debian.org]

Author: lool
Date: Sun Dec 16 13:34:55 2007
New Revision: 13904

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=13904
Log:
More cleanups

Modified:
    packages/unstable/libcm/debian/rules

Modified: packages/unstable/libcm/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libcm/debian/rules?rev=13904&op=diff
==============================================================================
--- packages/unstable/libcm/debian/rules (original)
+++ packages/unstable/libcm/debian/rules Sun Dec 16 13:34:55 2007
@@ -4,8 +4,6 @@
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
 STAMP_DIR := debian/stampdir
-
-PATCH_DIR := debian/patches
 
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
@@ -19,14 +17,20 @@
 else
 configure_flags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
 endif
-configure_flags += --prefix=/usr \
-			--mandir=\$${prefix}/share/man \
-			--infodir=\$${prefix}/share/info
+configure_flags += \
+	--prefix=/usr \
+	--mandir=\$${prefix}/share/man \
+	--infodir=\$${prefix}/share/info
+
+PATCH_DIR := debian/patches
+
+# how to call quilt
+QUILT := QUILT_PATCHES=$(PATCH_DIR) quilt --quiltrc /dev/null
 
 $(STAMP_DIR)/patch-stamp:
 	dh_testdir
 	# apply patches
-	QUILT_PATCHES=$(PATCH_DIR) quilt --quiltrc /dev/null push -a || test $$? = 2
+	$(QUILT) push -a || test $$? = 2
 	# backup the original (potentially patched) files to restore them in
 	# the clean target
 	-test -r config.sub && cp config.sub config.sub.orig
@@ -70,7 +74,7 @@
 	-test -r config.sub.orig && mv -f config.sub.orig config.sub
 	-test -r config.guess.orig && mv -f config.guess.orig config.guess
 	# unapply patches, if any
-	QUILT_PATCHES=$(PATCH_DIR) quilt --quiltrc /dev/null pop -a -R || test $$? = 2
+	$(QUILT) pop -a -R || test $$? = 2
 	-rm -rf .pc
 	-rm -rf $(STAMP_DIR)
 	-test -r /usr/share/misc/config.sub && test -r config.sub && \