Use --add-location=file for po/ and doc/po

[apt.git] / doc / makefile

diff --git a/doc/makefile b/doc/makefile
index 5ab31ad3b53d350e8b69978bc6684fa09c70c389..1f009b0f53f9f758b0378de81db7bcbfcc310cda 100644 (file)
--- a/doc/makefile
+++ b/doc/makefile
@@ -29,7 +29,7 @@ include $(COPY_H)
 clean: clean/subdirs clean/examples
 veryclean: veryclean/subdirs clean/examples
 manpages: apt-vendor.ent manpages/subdirs
-docbook: docbook/subdirs
+docbook: apt-vendor.ent docbook/subdirs
 
 DOCUMENTATIONPO = $(patsubst %.po,%,$(notdir $(wildcard po/*.po)))
 DOCDIRLIST = $(addsuffix /makefile,$(DOCUMENTATIONPO))
@@ -61,12 +61,15 @@ po4a: manpages/subdirs docbook/subdirs
 
 update-po:
        po4a --previous --no-backups --force --no-translations \
+               --msgmerge-opt --add-location=file \
+               --porefs noline,wrap \
                --package-name='$(PACKAGE)-doc' --package-version='$(PACKAGE_VERSION)' \
                --msgid-bugs-address='$(PACKAGE_MAIL)' po4a.conf
 
 manpages/subdirs: $(MANPAGEPOLIST)
 $(MANPAGEPOLIST) :: manpages-translation-% : %/makefile po4a.conf
        po4a --previous --no-backups --translate-only $(dir $<)apt.ent \
+               --msgmerge-opt --add-location=file \
                $(patsubst %,--translate-only $(dir $<)%,$(patsubst %.1.xml,%.$(subst /,,$(dir $<)).1.xml,$(wildcard *.1.xml))) \
                $(patsubst %,--translate-only $(dir $<)%,$(patsubst %.2.xml,%.$(subst /,,$(dir $<)).2.xml,$(wildcard *.2.xml))) \
                $(patsubst %,--translate-only $(dir $<)%,$(patsubst %.3.xml,%.$(subst /,,$(dir $<)).3.xml,$(wildcard *.3.xml))) \
@@ -81,6 +84,7 @@ $(MANPAGEPOLIST) :: manpages-translation-% : %/makefile po4a.conf
 docbook/subdirs: $(DOCBOOKPOLIST)
 $(DOCBOOKPOLIST) :: docbook-translation-% : %/makefile po4a.conf
        po4a --previous --no-backups --translate-only $(dir $<)apt.ent \
+               --msgmerge-opt --add-location=file \
                $(patsubst %,--translate-only $(dir $<)%,$(patsubst %.dbk,%.$(subst /,,$(dir $<)).dbk,$(wildcard *.dbk))) \
                --package-name='$(PACKAGE)-doc' --package-version='$(PACKAGE_VERSION)' \
                --msgid-bugs-address='$(PACKAGE_MAIL)' po4a.conf