[Pkg-zsh-commits] [SCM] Debian zsh package branch, debian, updated. debian/5.0.2-2-11-g336b60e

Axel Beckert abe at deuxchevaux.org
Sat Jan 5 04:04:09 UTC 2013


The following commit has been merged in the debian branch:
commit f16a3cd4d4a214d6736014f5b421bae9b3ffa48a
Author: Axel Beckert <abe at deuxchevaux.org>
Date:   Sat Jan 5 03:10:43 2013 +0100

    Use dh_auto_{configure,build,install,clean}

diff --git a/debian/rules b/debian/rules
index d765e36..bdf9378 100755
--- a/debian/rules
+++ b/debian/rules
@@ -56,21 +56,21 @@ ifeq (zsh-beta,$(package))
 endif
 
 build-arch: build-stamp
-	cd obj && $(MAKE)
-	cd obj && HOME="$(CURDIR)/obj/testhome" $(MAKE) check
+	dh_auto_build -B obj
+	HOME="$(CURDIR)/obj/testhome" dh_auto_test -B obj
 
 	touch build-arch
 
 build-indep: build-stamp
 ifeq (zsh,$(package))
-	cd obj && $(MAKE) pdf
+	dh_auto_build -B obj -- pdf
 endif
 
 	touch build-indep
 
 build-static: stamp-configure-static
 	dh_testdir
-	cd obj-static && $(MAKE)
+	dh_auto_build -B obj-static
 
 	touch build-static
 
@@ -89,13 +89,13 @@ ifeq (zsh-beta,$(package))
 	test -f Config/version.mk.orig || cp Config/version.mk Config/version.mk.orig
 	sed -i -e 's/^VERSION=\([^+]*\)$$/VERSION=\1-cvs$(snapshot_date)/' Config/version.mk
 endif
-	cd obj && CFLAGS='$(CFLAGS)' ../configure $(CONFIGFLAGS)
+	dh_auto_configure -B obj -- $(CONFIGFLAGS)
 	touch stamp-configure
 
 stamp-configure-static: configure
 	dh_testdir
 	mkdir obj-static
-	cd obj-static && CFLAGS='$(CFLAGS)' ../configure $(CONFIGFLAGS) $(STATICFLAGS)
+	dh_auto_configure -B obj-static -- $(CONFIGFLAGS) $(STATICFLAGS)
 #	cp debian/static.conf obj-static/Src/mymods.conf
 	sed -i -e 's/files.mdd link=no/files.mdd link=static/;s/stat.mdd link=no/stat.mdd link=static/' obj-static/config.modules
 	touch stamp-configure-static
@@ -107,8 +107,8 @@ ifeq (zsh-beta,$(package))
 	test ! -f Config/version.mk.orig || mv Config/version.mk.orig Config/version.mk
 endif
 	-rm -f build build-static
-	if test -d obj && cd obj && test -f Makefile; then $(MAKE) distclean; fi
-	if test -d obj-static && cd obj-static && test -f Makefile; then $(MAKE) distclean; fi
+	dh_auto_clean -B obj
+	dh_auto_clean -B obj-static
 ifneq (zsh-beta,$(package))
 	dh_auto_clean
 endif

-- 
Debian zsh package



More information about the Pkg-zsh-commits mailing list