[Pkg-gnupg-commit] [gnupg2] 01/07: build out-of-tree for cleanliness

[Daniel Kahn Gillmor]

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

dkg pushed a commit to branch experimental
in repository gnupg2.

commit 379879f156abf896309fe732a65d4156cda12961
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Wed Feb 10 18:10:06 2016 -0500

    build out-of-tree for cleanliness
---
 debian/clean |  1 +
 debian/rules | 10 +++++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/debian/clean b/debian/clean
index fc12542..1e7ff66 100644
--- a/debian/clean
+++ b/debian/clean
@@ -3,3 +3,4 @@ debian/gpg-check-pattern.1
 po/*.gmo
 po/stamp-po
 build-gpgv-udeb/
+build/
diff --git a/debian/rules b/debian/rules
index ccde094..d87e104 100755
--- a/debian/rules
+++ b/debian/rules
@@ -28,22 +28,22 @@ GPGV_UDEB_UNNEEDED = gpgtar bzip2 gpgsm scdaemon dirmngr doc tofu exec ldap gnut
 override_dh_auto_configure:
 	dh_auto_configure --builddirectory=build-gpgv-udeb -- \
 	   	$(foreach x, $(GPGV_UDEB_UNNEEDED), --disable-$(x))
-	dh_auto_configure -- --libexecdir=\$${prefix}/lib/gnupg2 \
+	dh_auto_configure --builddirectory=build -- --libexecdir=\$${prefix}/lib/gnupg2 \
 		--disable-gpgtar \
 		--enable-symcryptrun --enable-large-secmem
 
-override_dh_auto_build:
+override_dh_auto_build-arch:
 	dh_auto_build --builddirectory=build-gpgv-udeb
 	ln build-gpgv-udeb/g10/gpgv2 build-gpgv-udeb/g10/gpgv
-	dh_auto_build
+	dh_auto_build --builddirectory=build
 
 override_dh_shlibdeps:
 # Make ldap a recommends rather than a hard dependency.
 	dpkg-shlibdeps -Tdebian/dirmngr.substvars -dRecommends debian/dirmngr/usr/lib/gnupg2/dirmngr_ldap -dDepends debian/dirmngr/usr/bin/dirmngr*
 	dh_shlibdeps -Ndirmngr
 
-override_dh_auto_install:
-	dh_auto_install
+override_dh_auto_install-arch:
+	dh_auto_install --builddirectory=build
 	install -d debian/gnupg-agent/etc/X11/Xsession.d
 	install -m 644 debian/gnupg-agent.xsession \
 		debian/gnupg-agent/etc/X11/Xsession.d/90gpg-agent

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