This is an automated email from the git hooks/post-receive script. guillem pushed a commit to branch master in repository dpkg.
commit 734dfd60d4cc60b3ed30bb242cf200e493cf7625 Author: Guillem Jover <[email protected]> Date: Sun Oct 9 17:21:17 2016 +0200 build: Use builddir instead of CURDIR in man Makefile.am --- debian/changelog | 1 + man/Makefile.am | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9245717..dccd461 100644 --- a/debian/changelog +++ b/debian/changelog @@ -23,6 +23,7 @@ dpkg (1.18.11) UNRELEASED; urgency=medium support, use pkg-config unconditionally, and perform refinement checks only if available. - Check for the required minimal perl version. + - Use builddir instead of CURDIR in man Makefile.am. [ Updated manpages translations ] * German (Helge Kreutzmann). diff --git a/man/Makefile.am b/man/Makefile.am index fb4167c..14de9ca 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -79,7 +79,7 @@ PO4A_V = $(PO4A_V_@AM_V@) PO4A_V_ = $(PO4A_V_@AM_DEFAULT_V@) PO4A_V_0 = @echo " PO4A $@"; -PO4A_OPTS = --previous --srcdir $(srcdir) --destdir $(CURDIR) --no-backups \ +PO4A_OPTS = --previous --srcdir $(srcdir) --destdir $(builddir) --no-backups \ --porefs noline,wrap --msgmerge-opt=--add-location=file \ --package-name dpkg-man --package-version $(PACKAGE_VERSION) \ --copyright-holder "$(PACKAGE_COPYRIGHT_HOLDER)" \ @@ -114,8 +114,8 @@ install-data-local-yes: for lang in $(LINGUAS); do \ files=""; \ for trans in $(dist_man_MANS); do \ - if [ -f $(CURDIR)/$$lang/$$trans ]; then \ - files="$$files $(CURDIR)/$$lang/$$trans"; \ + if [ -f $(builddir)/$$lang/$$trans ]; then \ + files="$$files $(builddir)/$$lang/$$trans"; \ elif [ -f $(srcdir)/$$lang/$$trans ]; then \ files="$$files $(srcdir)/$$lang/$$trans"; \ fi; \ @@ -133,8 +133,8 @@ uninstall-local-yes: for lang in $(LINGUAS); do \ files=""; \ for trans in $(dist_man_MANS); do \ - if [ -f $(CURDIR)/$$lang/$$trans ]; then \ - files="$$files $(CURDIR)/$$lang/$$trans"; \ + if [ -f $(builddir)/$$lang/$$trans ]; then \ + files="$$files $(builddir)/$$lang/$$trans"; \ elif [ -f $(srcdir)/$$lang/$$trans ]; then \ files="$$files $(srcdir)/$$lang/$$trans"; \ fi; \ -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/dpkg/dpkg.git
