From e4bc41c765f2b9fec55faa747e8330130c987678 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Mon, 14 May 2012 14:39:15 +0200 Subject: - separate manpages from the rest of the doc building - make apt and apt-utils packages depend on manpages instead of full doc --- doc/makefile | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) (limited to 'doc/makefile') diff --git a/doc/makefile b/doc/makefile index df2ddb25f..f52586935 100644 --- a/doc/makefile +++ b/doc/makefile @@ -11,6 +11,11 @@ SOURCE = $(wildcard *.sgml) DEBIANDOC_HTML_OPTIONS=-l en.UTF-8 include $(DEBIANDOC_H) +MANPAGEPO = $(patsubst %.po,%,$(notdir $(wildcard po/*.po))) +MANPAGEPOLIST = $(patsubst %,manpages-translation-%,$(MANPAGEPO)) + +doc: manpages + # Do not use XMLTO, build the manpages directly with XSLTPROC ifdef XSLTPROC # generate a list of accepted man page translations @@ -22,15 +27,26 @@ LOCAL := manpage-$(firstword $(SOURCE)) $(LOCAL)-LIST := $(SOURCE) # Install generation hooks -doc: $($(LOCAL)-LIST) -veryclean: veryclean/$(LOCAL) +manpages: $(MANPAGEPOLIST) $($(LOCAL)-LIST) $($(LOCAL)-LIST) :: % : %.xml $(INCLUDES) echo Creating man page $@ $(XSLTPROC) -o $@ $(STYLESHEET) $< +$(MANPAGEPOLIST) :: manpages-translation-% : %/makefile po4a + $(MAKE) -C $(dir $<) doc + +.PHONY: manpages dirs-manpage-subdirs $(MANPAGEPOLIST) +dirs: dirs-manpage-subdirs +dirs-manpage-subdirs: + for i in $(MANPAGEPO); do \ + test -d $$i || mkdir $$i; \ + test -f $$i/makefile || sed "s#@@LANG@@#$$i#" lang.makefile > $$i/makefile; \ + done + # Clean rule .PHONY: veryclean/$(LOCAL) +veryclean: veryclean/$(LOCAL) veryclean/$(LOCAL): -rm -rf $($(@F)-LIST) @@ -47,12 +63,6 @@ TARGET = binary include $(COPY_H) .PHONY: clean clean-subdirs veryclean veryclean-subdirs all binary doc -doc: - for i in $(shell ls po/*.po | sed -r 's#po/([a-z]+[A-Z_]*).po#\1#'); do \ - test -d $$i || mkdir $$i; \ - test -f $$i/makefile || sed "s#@@LANG@@#$$i#" lang.makefile > $$i/makefile; \ - $(MAKE) -C $$i $@; \ - done clean: clean-subdirs veryclean: veryclean-subdirs -- cgit v1.2.3-70-g09d2 From 1c8754c2fc67e6bafd92af8cb964661e858c6f41 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Thu, 17 May 2012 22:21:03 +0200 Subject: * doc/makefile: - build manpages with the correct l10n.gentext.default.language setting to get the correct section titles provided by docbook --- buildlib/po4a_manpage.mak | 2 +- debian/changelog | 3 +++ doc/makefile | 2 ++ doc/manpage-style.xsl | 1 + 4 files changed, 7 insertions(+), 1 deletion(-) (limited to 'doc/makefile') diff --git a/buildlib/po4a_manpage.mak b/buildlib/po4a_manpage.mak index 404bb57a5..5814180d8 100644 --- a/buildlib/po4a_manpage.mak +++ b/buildlib/po4a_manpage.mak @@ -16,7 +16,7 @@ INCLUDES = apt.ent apt-verbatim.ent # Do not use XMLTO, build the manpages directly with XSLTPROC ifdef XSLTPROC -STYLESHEET=../manpage-style.xsl +STYLESHEET=manpage-style.xsl LOCAL := po4a-manpage-$(firstword $(SOURCE)) $(LOCAL)-LIST := $(SOURCE) diff --git a/debian/changelog b/debian/changelog index bcc29eb86..b6464388d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -28,6 +28,9 @@ apt (0.9.4) UNRELEASED; urgency=low * cmdline/apt-get.cc: - use the host architecture, not the build architecture for matching of [architecture restrictions] in Build-Depends (Closes: #672927) + * doc/makefile: + - build manpages with the correct l10n.gentext.default.language setting + to get the correct section titles provided by docbook [ Raphael Geissert ] * apt-pkg/acquire*.cc: diff --git a/doc/makefile b/doc/makefile index f52586935..76e29e2b9 100644 --- a/doc/makefile +++ b/doc/makefile @@ -42,6 +42,8 @@ dirs-manpage-subdirs: for i in $(MANPAGEPO); do \ test -d $$i || mkdir $$i; \ test -f $$i/makefile || sed "s#@@LANG@@#$$i#" lang.makefile > $$i/makefile; \ + test -f $$i/manpage-style.xsl || sed "// i\ +" manpage-style.xsl > $$i/manpage-style.xsl; \ done # Clean rule diff --git a/doc/manpage-style.xsl b/doc/manpage-style.xsl index 85aa4521f..ef349f064 100644 --- a/doc/manpage-style.xsl +++ b/doc/manpage-style.xsl @@ -5,6 +5,7 @@ + <> -- cgit v1.2.3-70-g09d2 From 75f37d7d27c2579ddb88f852087a54934cb00c8b Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sun, 20 May 2012 18:37:14 +0200 Subject: move the creation of the manpage-style.xsl file to the rest of the manpage building instead of doing it at setup time, so we can properly depend on it --- buildlib/po4a_manpage.mak | 6 +++++- doc/makefile | 4 +--- 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'doc/makefile') diff --git a/buildlib/po4a_manpage.mak b/buildlib/po4a_manpage.mak index 5814180d8..1dedd0dcd 100644 --- a/buildlib/po4a_manpage.mak +++ b/buildlib/po4a_manpage.mak @@ -28,7 +28,11 @@ veryclean: veryclean/$(LOCAL) apt-verbatim.ent: ../apt-verbatim.ent cp ../apt-verbatim.ent . -$($(LOCAL)-LIST) :: % : %.xml $(INCLUDES) +manpage-style.xsl: ../manpage-style.xsl + sed "// i\ +" ../manpage-style.xsl > manpage-style.xsl + +$($(LOCAL)-LIST) :: % : %.xml $(STYLESHEET) $(INCLUDES) echo Creating man page $@ $(XSLTPROC) -o $@ $(STYLESHEET) $< || exit 200 # why xsltproc doesn't respect the -o flag here??? test -f $(subst .$(LC),,$@) || echo FIXME: xsltproc respect the -o flag now, workaround can be removed diff --git a/doc/makefile b/doc/makefile index 76e29e2b9..4c0a431fd 100644 --- a/doc/makefile +++ b/doc/makefile @@ -29,7 +29,7 @@ $(LOCAL)-LIST := $(SOURCE) # Install generation hooks manpages: $(MANPAGEPOLIST) $($(LOCAL)-LIST) -$($(LOCAL)-LIST) :: % : %.xml $(INCLUDES) +$($(LOCAL)-LIST) :: % : %.xml $(STYLESHEET) $(INCLUDES) echo Creating man page $@ $(XSLTPROC) -o $@ $(STYLESHEET) $< @@ -42,8 +42,6 @@ dirs-manpage-subdirs: for i in $(MANPAGEPO); do \ test -d $$i || mkdir $$i; \ test -f $$i/makefile || sed "s#@@LANG@@#$$i#" lang.makefile > $$i/makefile; \ - test -f $$i/manpage-style.xsl || sed "// i\ -" manpage-style.xsl > $$i/manpage-style.xsl; \ done # Clean rule -- cgit v1.2.3-70-g09d2