diff options
| author | Michael Vogt <mvo@ubuntu.com> | 2014-09-05 14:41:54 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@ubuntu.com> | 2014-09-05 14:41:54 +0200 |
| commit | 8c782efd93342c6119e8ba2ff6989b7a164b7f3d (patch) | |
| tree | 9f35af8ed996540e6a67a34cc8924dcc27094074 /buildlib/docbook.mak | |
| parent | 19fb04e82cdc90d429777fcc4c7a2b33e34d20e5 (diff) | |
| parent | 592d06b6f3c2ef2ae47c38005ae3c4e96a0841f2 (diff) | |
Merge branch 'debian/sid' into debian/experimental
Conflicts:
apt-pkg/acquire-item.cc
configure.ac
debian/changelog
doc/apt-verbatim.ent
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/pt.po
po/ar.po
po/ast.po
po/bg.po
po/bs.po
po/ca.po
po/cs.po
po/cy.po
po/da.po
po/de.po
po/dz.po
po/el.po
po/es.po
po/eu.po
po/fi.po
po/fr.po
po/gl.po
po/hu.po
po/it.po
po/ja.po
po/km.po
po/ko.po
po/ku.po
po/lt.po
po/mr.po
po/nb.po
po/ne.po
po/nl.po
po/nn.po
po/pl.po
po/pt.po
po/pt_BR.po
po/ro.po
po/ru.po
po/sk.po
po/sl.po
po/sv.po
po/th.po
po/tl.po
po/tr.po
po/uk.po
po/vi.po
po/zh_CN.po
po/zh_TW.po
test/integration/test-ubuntu-bug-346386-apt-get-update-paywall
Diffstat (limited to 'buildlib/docbook.mak')
| -rw-r--r-- | buildlib/docbook.mak | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/buildlib/docbook.mak b/buildlib/docbook.mak index 272475721..6aa3ca0d2 100644 --- a/buildlib/docbook.mak +++ b/buildlib/docbook.mak @@ -13,6 +13,7 @@ LOCAL := docbook-$(firstword $(SOURCE)) $(LOCAL)-HTML := $(addsuffix .html,$(addprefix $(DOC)/,$(basename $(SOURCE)))) $(LOCAL)-TEXT := $(addsuffix .text,$(addprefix $(DOC)/,$(basename $(SOURCE)))) +INCLUDES = apt.ent apt-verbatim.ent apt-vendor.ent docbook: @@ -30,7 +31,7 @@ veryclean: veryclean/html/$(LOCAL) vpath %.dbk $(SUBDIRS) vpath $(DOCBOOK_HTML_STYLESHEET) $(SUBDIRS) -$(DOC)/%.html: %.dbk $(DOCBOOK_HTML_STYLESHEET) +$(DOC)/%.html: %.dbk $(DOCBOOK_HTML_STYLESHEET) $(INCLUDES) echo Creating html for $< to $@ -rm -rf $@ mkdir -p $@ @@ -59,7 +60,7 @@ veryclean: veryclean/text/$(LOCAL) vpath %.dbk $(SUBDIRS) vpath $(DOCBOOK_TEXT_STYLESHEET) $(SUBDIRS) -$(DOC)/%.text: %.dbk $(DOCBOOK_TEXT_STYLESHEET) +$(DOC)/%.text: %.dbk $(DOCBOOK_TEXT_STYLESHEET) $(INCLUDES) echo Creating text for $< to $@ $(DOCBOOK) \ --stringparam l10n.gentext.default.language $(LC) \ |