diff options
author | David Kalnischkies <kalnischkies@gmail.com> | 2012-06-29 13:52:52 +0200 |
---|---|---|
committer | David Kalnischkies <kalnischkies@gmail.com> | 2012-06-29 13:52:52 +0200 |
commit | 1098ae37273547d0b4c7d05c8c6b36db56c25443 (patch) | |
tree | c9f7f22bce8dcf211e3510ca852128ba737ec510 /buildlib | |
parent | ba4c8a96f4ecd883bc9195f8a6e625304693829b (diff) | |
download | apt-1098ae37273547d0b4c7d05c8c6b36db56c25443.tar.gz |
* debian/control:
- demote debiandoc-sgml to Build-Depends-Indep
* doc/makefile:
- separate translation building of debiandoc from manpages
so that we don't need to build debiandoc for binary packages
Diffstat (limited to 'buildlib')
-rw-r--r-- | buildlib/debiandoc.mak | 6 | ||||
-rw-r--r-- | buildlib/defaults.mak | 2 | ||||
-rw-r--r-- | buildlib/po4a_manpage.mak | 4 |
3 files changed, 8 insertions, 4 deletions
diff --git a/buildlib/debiandoc.mak b/buildlib/debiandoc.mak index a97af0caf..7e22467cf 100644 --- a/buildlib/debiandoc.mak +++ b/buildlib/debiandoc.mak @@ -14,13 +14,15 @@ LOCAL := debiandoc-$(firstword $(SOURCE)) $(LOCAL)-HTML := $(addsuffix .html,$(addprefix $(DOC)/,$(basename $(SOURCE)))) $(LOCAL)-TEXT := $(addsuffix .text,$(addprefix $(DOC)/,$(basename $(SOURCE)))) +debiandoc: + #--------- # Rules to build HTML documentations ifdef DEBIANDOC_HTML # Install generation hooks -doc: $($(LOCAL)-HTML) +debiandoc: $($(LOCAL)-HTML) veryclean: veryclean/html/$(LOCAL) vpath %.sgml $(SUBDIRS) @@ -42,7 +44,7 @@ endif ifdef DEBIANDOC_TEXT # Install generation hooks -doc: $($(LOCAL)-TEXT) +debiandoc: $($(LOCAL)-TEXT) veryclean: veryclean/text/$(LOCAL) vpath %.sgml $(SUBDIRS) diff --git a/buildlib/defaults.mak b/buildlib/defaults.mak index 7b084f4b9..5b970876a 100644 --- a/buildlib/defaults.mak +++ b/buildlib/defaults.mak @@ -121,7 +121,7 @@ MKDIRS := $(BIN) all: dirs binary doc binary: library program maintainer-clean dist-clean distclean pristine sanity: veryclean -startup headers library clean veryclean program test update-po manpages: +startup headers library clean veryclean program test update-po manpages debiandoc: veryclean: echo Very Clean done for $(SUBDIR) diff --git a/buildlib/po4a_manpage.mak b/buildlib/po4a_manpage.mak index 1dedd0dcd..09eca0ec2 100644 --- a/buildlib/po4a_manpage.mak +++ b/buildlib/po4a_manpage.mak @@ -13,6 +13,8 @@ SOURCE = $(patsubst %.xml,%,$(wildcard *.$(LC).?.xml)) INCLUDES = apt.ent apt-verbatim.ent +manpages: + # Do not use XMLTO, build the manpages directly with XSLTPROC ifdef XSLTPROC @@ -22,7 +24,7 @@ LOCAL := po4a-manpage-$(firstword $(SOURCE)) $(LOCAL)-LIST := $(SOURCE) # Install generation hooks -doc: $($(LOCAL)-LIST) +manpages: $($(LOCAL)-LIST) veryclean: veryclean/$(LOCAL) apt-verbatim.ent: ../apt-verbatim.ent |