Przeglądaj źródła

build: Use builddir instead of CURDIR in man Makefile.am

Guillem Jover 9 lat temu
rodzic
commit
734dfd60d4
2 zmienionych plików z 6 dodań i 5 usunięć
  1. 1 0
      debian/changelog
  2. 5 5
      man/Makefile.am

+ 1 - 0
debian/changelog

@@ -23,6 +23,7 @@ dpkg (1.18.11) UNRELEASED; urgency=medium
       support, use pkg-config unconditionally, and perform refinement checks
       support, use pkg-config unconditionally, and perform refinement checks
       only if available.
       only if available.
     - Check for the required minimal perl version.
     - Check for the required minimal perl version.
+    - Use builddir instead of CURDIR in man Makefile.am.
 
 
   [ Updated manpages translations ]
   [ Updated manpages translations ]
   * German (Helge Kreutzmann).
   * German (Helge Kreutzmann).

+ 5 - 5
man/Makefile.am

@@ -79,7 +79,7 @@ PO4A_V = $(PO4A_V_@AM_V@)
 PO4A_V_ = $(PO4A_V_@AM_DEFAULT_V@)
 PO4A_V_ = $(PO4A_V_@AM_DEFAULT_V@)
 PO4A_V_0 = @echo "  PO4A   $@";
 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 \
             --porefs noline,wrap --msgmerge-opt=--add-location=file \
             --package-name dpkg-man --package-version $(PACKAGE_VERSION) \
             --package-name dpkg-man --package-version $(PACKAGE_VERSION) \
             --copyright-holder "$(PACKAGE_COPYRIGHT_HOLDER)" \
             --copyright-holder "$(PACKAGE_COPYRIGHT_HOLDER)" \
@@ -114,8 +114,8 @@ install-data-local-yes:
 	for lang in $(LINGUAS); do \
 	for lang in $(LINGUAS); do \
 		files=""; \
 		files=""; \
 		for trans in $(dist_man_MANS); do \
 		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 \
 			elif [ -f $(srcdir)/$$lang/$$trans ]; then \
 				files="$$files $(srcdir)/$$lang/$$trans"; \
 				files="$$files $(srcdir)/$$lang/$$trans"; \
 			fi; \
 			fi; \
@@ -133,8 +133,8 @@ uninstall-local-yes:
 	for lang in $(LINGUAS); do \
 	for lang in $(LINGUAS); do \
 		files=""; \
 		files=""; \
 		for trans in $(dist_man_MANS); do \
 		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 \
 			elif [ -f $(srcdir)/$$lang/$$trans ]; then \
 				files="$$files $(srcdir)/$$lang/$$trans"; \
 				files="$$files $(srcdir)/$$lang/$$trans"; \
 			fi; \
 			fi; \