Merge remote-tracking branch 'mvo/bugfix/apt-search-case' into debian/sid

[ntk/apt.git] / doc / makefile

diff --git a/doc/makefile b/doc/makefile
index ebaca90..3939c74 100644 (file)
--- a/doc/makefile
+++ b/doc/makefile
@@ -15,6 +15,8 @@ doc: manpages debiandoc
 examples/sources.list: ../vendor/current/sources.list
        ln -sf $(shell readlink -f $^) $@
 
+apt-vendor.ent: ../vendor/current/apt-vendor.ent
+       ln -sf $(shell readlink -f $^) $@
 
 # Examples
 SOURCE = examples/apt.conf examples/sources.list examples/configure-index examples/apt-https-method-example.conf
@@ -26,7 +28,7 @@ include $(COPY_H)
 
 clean: clean/subdirs clean/examples
 veryclean: veryclean/subdirs clean/examples
-manpages: manpages/subdirs
+manpages: apt-vendor.ent manpages/subdirs
 debiandoc: debiandoc/subdirs
 
 DOCUMENTATIONPO = $(patsubst %.po,%,$(notdir $(wildcard po/*.po)))
@@ -44,6 +46,7 @@ debiandoc/subdirs manpages/subdirs clean/subdirs veryclean/subdirs:
 
 clean/examples:
        rm -f examples/sources.list
+       rm -f apt-vendor.ent
 
 stats:
        for i in po/*.po; do echo -n "$$i: "; msgfmt --output-file=/dev/null --statistics $$i; done
@@ -63,9 +66,7 @@ update-po:
 
 manpages/subdirs: $(MANPAGEPOLIST)
 $(MANPAGEPOLIST) :: manpages-translation-% : %/makefile po4a.conf
-       # first line is for apt.8 (see Bug#696923)
        po4a --previous --no-backups --translate-only $(dir $<)apt.ent \
-               $(patsubst %,--translate-only $(dir $<)%,$(patsubst %.8,%.$(subst /,,$(dir $<)).8,$(wildcard *.8))) \
                $(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))) \