Browse Source

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

Guillem Jover 17 years ago
parent
commit
14f650abf0
3 changed files with 10 additions and 7 deletions
  1. 5 0
      ChangeLog
  2. 2 2
      debian/changelog
  3. 3 5
      man/Makefile.am

+ 5 - 0
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',

+ 2 - 2
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
 

+ 3 - 5
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