[Reproducible-commits] [dpkg] 03/61: debian: Use an intermediate variable to hold debian/tmp

Jérémy Bobbio lunar at moszumanska.debian.org
Mon Sep 21 09:56:01 UTC 2015


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

lunar pushed a commit to branch pu/reproducible_builds
in repository dpkg.

commit 56a777da0bc20dd1c49564e2a97fc7fdfe93aa51
Author: Guillem Jover <guillem at debian.org>
Date:   Sun Aug 9 05:25:28 2015 +0200

    debian: Use an intermediate variable to hold debian/tmp
---
 debian/rules | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian/rules b/debian/rules
index 0706032..f4bd7bf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -37,6 +37,8 @@ ifeq (,$(filter maintainer-build,$(DEB_BUILD_OPTIONS)))
 	confflags += --disable-silent-rules
 endif
 
+D := $(CURDIR)/debian/tmp
+
 # Create configure script if necessary, automake handles rebuilding it.
 configure:
 	dh_testdir
@@ -82,13 +84,13 @@ install: check
 	dh_prep
 	dh_installdirs
 
-	cd build-tree && $(MAKE) DESTDIR="$(CURDIR)/debian/tmp" install
+	cd build-tree && $(MAKE) DESTDIR=$(D) install
 
 ifeq (yes,$(shell dpkg-vendor --derives-from Ubuntu && echo yes))
 	# Ubuntu's «i386» architecture is built for i686 (the Debian default
 	# is i586).
 	sed -ri 's/^(i386[[:space:]]+)[^[:space:]]+/\1i686/' \
-	        $(CURDIR)/debian/tmp/usr/share/dpkg/cputable
+	        $(D)/usr/share/dpkg/cputable
 endif
 
 define dpkg-installmanl10n

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



More information about the Reproducible-commits mailing list