[zoo-project] 15/23: Use dh-autoreconf.

[Bas Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository zoo-project.

commit 5768afe190e96a66c4124d3262712e9fdf429e1e
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Jun 26 01:18:25 2016 +0200

    Use dh-autoreconf.
---
 debian/autoreconf |  1 +
 debian/control    |  4 +---
 debian/rules      | 21 ++++++++++++++++-----
 3 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/debian/autoreconf b/debian/autoreconf
new file mode 100644
index 0000000..de15002
--- /dev/null
+++ b/debian/autoreconf
@@ -0,0 +1 @@
+zoo-project/zoo-kernel
diff --git a/debian/control b/debian/control
index 7d967c4..939ff77 100644
--- a/debian/control
+++ b/debian/control
@@ -4,10 +4,8 @@ Uploaders: Angelos Tzotsos <gcpp.kalxas at gmail.com>
 Section: web
 Priority: optional
 Build-Depends: debhelper (>= 9),
+               dh-autoreconf,
                dpkg-dev (>= 1.16.1.1),
-               autoconf,
-               automake,
-               autotools-dev,
                flex,
                bison,
                libssl-dev,
diff --git a/debian/rules b/debian/rules
index fcc1916..6600d26 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,18 +5,29 @@
 export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 
 %:
-	dh $@ --parallel
+	dh $@ --with autoreconf --parallel
 
 override_dh_auto_configure:
-	cd zoo-project/zoo-kernel && autoconf && ./configure --with-python --with-js --with-mapserver=/usr --with-ms-version=7
+	dh_auto_configure --sourcedirectory=zoo-project/zoo-kernel \
+	                  --builddirectory=zoo-project/zoo-kernel \
+	                  -- --with-python \
+	                     --with-js \
+	                     --with-mapserver=/usr \
+	                     --with-ms-version=7
 
 override_dh_auto_build:
-	dh_auto_build --builddirectory thirds/cgic206
-	dh_auto_build --builddirectory zoo-project/zoo-kernel
+	dh_auto_build --sourcedirectory=thirds/cgic206 \
+	              --builddirectory=thirds/cgic206
+	dh_auto_build --sourcedirectory=zoo-project/zoo-kernel \
+	              --builddirectory=zoo-project/zoo-kernel
 	cd zoo-project/zoo-services/ogr/base-vect-ops && make
 
 override_dh_auto_install:
-	cd zoo-project/zoo-kernel && make install DESTDIR=$(CURDIR)/debian/tmp INST_LIB=/usr/lib INST_INCLUDE=/usr/include
+	dh_auto_install --sourcedirectory=zoo-project/zoo-kernel \
+	                --builddirectory=zoo-project/zoo-kernel \
+	                --destdir=$(CURDIR)/debian/tmp \
+	                -- INST_LIB=/usr/lib INST_INCLUDE=/usr/include
+
 	-mv -v $(CURDIR)/zoo-project/zoo-kernel/main.cfg $(CURDIR)/debian/tmp/usr/lib/cgi-bin/
 	install -m755 $(CURDIR)/zoo-project/zoo-services/ogr/base-vect-ops/cgi-env/ogr_service.zo $(CURDIR)/debian/tmp/usr/lib/cgi-bin/
 	-mv -v $(CURDIR)/zoo-project/zoo-services/ogr/base-vect-ops/cgi-env/*.zcfg $(CURDIR)/debian/tmp/usr/lib/cgi-bin/

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/zoo-project.git