[boinc] 01/01: use dh_auto_configure, but without multi-arch

[Guo Yixuan]

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

yixuan-guest pushed a commit to branch master
in repository boinc.

commit df04d874846955d1c5b0014e3796f58e96a4d4a4
Author: Guo Yixuan <culu.gyx at gmail.com>
Date:   Mon May 26 18:05:09 2014 -0400

    use dh_auto_configure, but without multi-arch
---
 debian/changelog | 6 ++++++
 debian/rules     | 7 ++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index fecf1d3..6b4c061 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+boinc (7.3.19+dfsg-2) UNRELEASED; urgency=medium
+
+  * Use more debhelper features.
+
+ -- Guo Yixuan (郭溢譞) <culu.gyx at gmail.com>  Mon, 26 May 2014 18:02:53 -0400
+
 boinc (7.3.19+dfsg-1) experimental; urgency=low
 
   * New upstream release, wx3.0 compatible.
diff --git a/debian/rules b/debian/rules
index eb2564b..48feb0b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -173,9 +173,14 @@ $(shell sed 's/^@//' -i debian/control)
 # For debugging, these options are useful:
 #   --enable-debug
 #   --enable-wx-debug (need to install libwxbase2.8-dbg and libwxgtk2.8-dbg)
+#
+# The --libdir and --libexecdir is added to turn off
+# the debhelper multiarch feature.
 CFGFLAGS_boinc-client = \
   $(TYPE_FLAGS) \
   --prefix=/usr \
+  --libdir=/usr/lib \
+  --libexecdir=/usr/lib \
   $(ENABLE_CLIENT) \
   $(ENABLE_SERVER) \
   --disable-fcgi \
@@ -252,7 +257,7 @@ override_dh_auto_configure:
 	@echo
 	cp -f /usr/share/misc/config.guess config.guess
 	cp -f /usr/share/misc/config.sub config.sub
-	./configure $(CFGFLAGS_boinc-client)
+	dh_auto_configure -- $(CFGFLAGS_boinc-client)
 
 update-boinc-applinks.1: debian/manpages/update-boinc-applinks.xml
 	docbook2x-man debian/manpages/update-boinc-applinks.xml

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