X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/67c160fb95359506bca3e2899ea4851abdb157c4..766761fd836d9e247daea924809965c21cc65dc7:/doc/makefile?ds=inline

diff --git a/doc/makefile b/doc/makefile
index 5ab31ad3b..785c0b125 100644
--- a/doc/makefile
+++ b/doc/makefile
@@ -13,10 +13,10 @@ include $(DOCBOOK_H)
 doc: manpages docbook
 
 examples/sources.list: ../vendor/current/sources.list
-	ln -sf $(shell readlink -f $^) $@
+	ln -sf '$(abspath $^)' $@
 
 apt-vendor.ent: ../vendor/current/apt-vendor.ent
-	ln -sf $(shell readlink -f $^) $@
+	ln -sf '$(abspath $^)' $@
 
 # Examples
 SOURCE = examples/apt.conf examples/sources.list examples/configure-index examples/apt-https-method-example.conf
@@ -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,19 @@ 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
+	sed -n '/^#$$/,$$p' po/apt-doc.pot > po/apt-doc.pot.headerfree
+	#cat po/apt-doc.pot > po/apt-doc.pot.headerfree
+	cat po/header.pot.txt po/apt-doc.pot.headerfree > po/apt-doc.pot
+	rm -f po/apt-doc.pot.headerfree
 
 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 +88,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