From: Guillem Jover Date: Wed, 9 May 2007 19:21:21 +0000 (+0000) Subject: * man/Makefile.am (install-data-local): Install the translated man X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=14f650abf026e57efe721f1216b31c5a0528f635;p=dpkg * man/Makefile.am (install-data-local): Install the translated man pages from the srcdir. --- diff --git a/ChangeLog b/ChangeLog index e68bb649..2030cfab 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-05-09 Guillem Jover + + * man/Makefile.am (install-data-local): Install the translated man + pages from the srcdir. + 2007-05-09 Guillem Jover * Makefile.am (EXTRA_DIST): Add 'debian/dpkg-dev.lintian-overrides', diff --git a/debian/changelog b/debian/changelog index a24746a4..41870068 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,8 +7,8 @@ dpkg (1.14.2) UNRELEASED; urgency=low * Add solaris support to ostable and triplettable. Closes: #361866 * Properly create the generic name symlink in update-alternatives for new alternatives. Closes: #422979 - * Include translations again, which disappeared due to a dirty source tree. - Closes: #423029, #423085 + * Include translations again, which disappeared due to a dirty source tree + and a bogus Makefile.am for the man pages. Closes: #423029, #423085 -- Guillem Jover Tue, 08 May 2007 18:48:22 +0300 diff --git a/man/Makefile.am b/man/Makefile.am index 5fec22ac..2a35185d 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -18,14 +18,12 @@ LINGUAS = $(shell sed -ne 's/^.*\[po4a_langs\] \(.*\)$$/\1/p' $(srcdir)/po/po4a. install-data-local: for lang in $(LINGUAS); do \ - if [ -d $$lang ]; then \ - cd $$lang; \ - files=$$(echo *.[1-9]); \ - $(MAKE) -f ../Makefile install-man \ + if [ -d $(srcdir)/$$lang ]; then \ + files=$$(echo $(srcdir)/$$lang/*.[1-9]); \ + $(MAKE) install-man \ mandir="$(mandir)/$$lang" \ man_MANS="" \ dist_man_MANS="$$files"; \ - cd ..; \ fi \ done