* man/Makefile.am (install-data-local): Install the translated man

	pages from the srcdir.

diff --git a/ChangeLog b/ChangeLog
index e68bb6491f202b2fc7765d9f351538aae03f166a..2030cfab0ac159dc7dae93f56b7b5b5dd08d7940 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-05-09  Guillem Jover  <guillem@debian.org>
+
+       * man/Makefile.am (install-data-local): Install the translated man
+       pages from the srcdir.
+
 2007-05-09  Guillem Jover  <guillem@debian.org>
 
        * Makefile.am (EXTRA_DIST): Add 'debian/dpkg-dev.lintian-overrides',

diff --git a/debian/changelog b/debian/changelog
index a24746a442d1658b2235ac98e07e607824a462a2..4187006829e1301185c6f4a4ff91affabe443842 100644 (file)
--- 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 <guillem@debian.org>  Tue, 08 May 2007 18:48:22 +0300
 

diff --git a/man/Makefile.am b/man/Makefile.am
index 5fec22ac9e95748817c320de2c8c689c2ed8d92c..2a35185dd57649451348ecfded526a741e3e9c87 100644 (file)
--- 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