diff options
| author | Michael Vogt <mvo@debian.org> | 2013-12-05 08:24:00 +0100 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2013-12-05 08:24:00 +0100 |
| commit | 44633bd7cac1ce68d4e475285a0f45b7a8952a7f (patch) | |
| tree | 3e3af83bb955b9f49f38239d490b5173bb0b9ac4 /doc/en | |
| parent | b10b0c4aac5d0648125d4203eea6900032efb7ba (diff) | |
| parent | 7014e1482942d00b66eb30061b0cf5d2a7b3ebf3 (diff) | |
Merge branch 'debian/sid' into ubuntu/master
Conflicts:
apt-pkg/deb/dpkgpm.cc
cmdline/apt-key.in
debian/control
doc/apt-key.8.xml
doc/makefile
doc/po/apt-doc.pot
doc/po/de.po
doc/po/es.po
doc/po/fr.po
doc/po/it.po
doc/po/ja.po
doc/po/pl.po
doc/po/pt.po
doc/po/pt_BR.po
Diffstat (limited to 'doc/en')
| -rw-r--r-- | doc/en/makefile | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/doc/en/makefile b/doc/en/makefile index a4fb232d4..247ce38b5 100644 --- a/doc/en/makefile +++ b/doc/en/makefile @@ -9,12 +9,15 @@ include ../../buildlib/defaults.mak ifdef XSLTPROC # generate a list of accepted man page translations SOURCE = $(patsubst ../%.xml,%,$(wildcard ../*.?.xml)) -INCLUDES = ../apt.ent ../apt-verbatim.ent +INCLUDES = ../apt.ent ../apt-verbatim.ent apt-vendor.ent STYLESHEET=../manpage-style.xsl LOCAL := manpage-$(firstword $(SOURCE)) $(LOCAL)-LIST := $(SOURCE) +apt-vendor.ent: ../../vendor/current/apt-vendor.ent + ln -sf $(shell readlink -f $^) $@ + # Install generation hooks manpages: $($(LOCAL)-LIST) apt.8 @@ -30,7 +33,7 @@ apt.8: ../apt.8 veryclean: clean/$(LOCAL) clean: clean/$(LOCAL) clean/$(LOCAL): - -rm -rf $($(@F)-LIST) apt.8 + -rm -rf $($(@F)-LIST) apt.8 apt-vendor.ent endif # Chain to the manpage rule |