build the en manpages in subdirectory doc/en

Building manpages becames more consistent this way and
it is simpler to ignore build artefacts, too.

diff --git a/.gitignore b/.gitignore
index e66f9df3b2c354eb0d18f94fab352dff2c27a17f..3e07e241bea35b7c35a3ef9eaf939b3c7a131dda 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -14,6 +14,7 @@
 /doc/*/
 !/doc/examples/
 !/doc/po/
 /doc/*/
 !/doc/examples/
 !/doc/po/

+!/doc/en/makefile

 
 # package building artifacts
 /debian/*.log
 
 # package building artifacts
 /debian/*.log

diff --git a/buildlib/po4a_manpage.mak b/buildlib/po4a_manpage.mak
index 09eca0ec270d8d321f04829fa000104f082550d9..1e778cf112eda96a482b689ffd557629090f63ad 100644 (file)
--- a/buildlib/po4a_manpage.mak
+++ b/buildlib/po4a_manpage.mak
@@ -25,6 +25,7 @@ $(LOCAL)-LIST := $(SOURCE)
 
 # Install generation hooks
 manpages: $($(LOCAL)-LIST)
 
 # Install generation hooks
 manpages: $($(LOCAL)-LIST)

+clean: clean/$(LOCAL)

 veryclean: veryclean/$(LOCAL)
 
 apt-verbatim.ent: ../apt-verbatim.ent
 veryclean: veryclean/$(LOCAL)
 
 apt-verbatim.ent: ../apt-verbatim.ent


@@ -37,15 +38,16 @@ 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???
 $($(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
+       test -f $(subst .$(LC),,$@) || echo 'FIXME: xsltproc respects the -o flag now, workaround can be removed'

        mv -f $(subst .$(LC),,$@) $@
 
 # Clean rule
        mv -f $(subst .$(LC),,$@) $@
 
 # Clean rule

-.PHONY: veryclean/$(LOCAL)
+.PHONY: clean/$(LOCAL) veryclean/$(LOCAL)
+clean/$(LOCAL):
+       rm -f $($(@F)-LIST) apt.ent apt-verbatim.ent

 veryclean/$(LOCAL):
 veryclean/$(LOCAL):

-       -rm -rf $($(@F)-LIST) apt.ent apt-verbatim.ent apt.$(LC).8 \
-               $(addsuffix .xml,$($(@F)-LIST)) \
-               offline.$(LC).sgml guide.$(LC).sgml
+       # we are nuking the directory we are working in as it is auto-generated
+       rm -rf $(shell readlink -f .)

 
 HAVE_PO4A=yes
 endif
 
 HAVE_PO4A=yes
 endif

diff --git a/debian/changelog b/debian/changelog
index aa8553251f4acf7272f8236b73328775dd793aae..1a8604e099a27b6a45f1a2e71b7dc2776b23e2c6 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+apt (0.9.8.3) UNRELEASED; urgency=low
+
+  [ David Kalnischkies ]
+  * build the en manpages in subdirectory doc/en
+
+ -- David Kalnischkies <kalnischkies@gmail.com>  Sun, 09 Jun 2013 15:06:24 +0200
+

 apt (0.9.8.2) unstable; urgency=low
 
   [ Programs translations ]
 apt (0.9.8.2) unstable; urgency=low
 
   [ Programs translations ]

diff --git a/debian/rules b/debian/rules
index 5051dab4f8caaa32bcd05574dd71fee51a567684..79a6dbe0cc6bb812ff871a23c12722a32999e2f5 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -203,7 +203,7 @@ apt: build build-manpages
        dh_bugfiles -p$@
        dh_lintian -p$@
        dh_installexamples -p$@ $(BLD)/docs/examples/*
        dh_bugfiles -p$@
        dh_lintian -p$@
        dh_installexamples -p$@ $(BLD)/docs/examples/*

-       dh_installman -p$@ $(wildcard $(patsubst %,doc/%.[158],$(apt_MANPAGES)) $(patsubst %,doc/*/%.*.[158],$(apt_MANPAGES)))
+       dh_installman -p$@ $(wildcard $(patsubst %,doc/en/%.[158],$(apt_MANPAGES)) $(patsubst %,doc/*/%.*.[158],$(apt_MANPAGES)))

        dh_installcron -p$@
        dh_installdocs -p$@
        dh_installchangelogs -p$@
        dh_installcron -p$@
        dh_installdocs -p$@
        dh_installchangelogs -p$@


@@ -253,7 +253,7 @@ apt-utils: build build-manpages
        dh_installexamples -p$@
 
        # Install the man pages..
        dh_installexamples -p$@
 
        # Install the man pages..

-       dh_installman -p$@ $(wildcard $(patsubst %,doc/%.[158],$(apt-utils_MANPAGES)) $(patsubst %,doc/*/%.*.[158],$(apt-utils_MANPAGES)))
+       dh_installman -p$@ $(wildcard $(patsubst %,doc/en/%.[158],$(apt-utils_MANPAGES)) $(patsubst %,doc/*/%.*.[158],$(apt-utils_MANPAGES)))

 
        dh_installchangelogs -p$@
        dh_strip -p$@
 
        dh_installchangelogs -p$@
        dh_strip -p$@

diff --git a/doc/en/makefile b/doc/en/makefile
new file mode 100644 (file)
index 0000000..a4fb232
--- /dev/null
+++ b/doc/en/makefile
@@ -0,0 +1,38 @@
+# -*- make -*-
+BASE=../..
+SUBDIR=doc/en
+
+# Bring in the default rules
+include ../../buildlib/defaults.mak
+
+# Do not use XMLTO, build the manpages directly with XSLTPROC
+ifdef XSLTPROC
+# generate a list of accepted man page translations
+SOURCE = $(patsubst ../%.xml,%,$(wildcard ../*.?.xml))
+INCLUDES = ../apt.ent ../apt-verbatim.ent
+STYLESHEET=../manpage-style.xsl
+
+LOCAL := manpage-$(firstword $(SOURCE))
+$(LOCAL)-LIST := $(SOURCE)
+
+# Install generation hooks
+manpages: $($(LOCAL)-LIST) apt.8
+
+$($(LOCAL)-LIST) :: % : ../%.xml $(STYLESHEET) $(INCLUDES)
+       echo Creating man page $@
+       $(XSLTPROC) -o $@ $(STYLESHEET) $<
+
+apt.8: ../apt.8
+       cp -a ../apt.8 apt.8
+
+# Clean rule
+.PHONY: clean/$(LOCAL)
+veryclean: clean/$(LOCAL)
+clean: clean/$(LOCAL)
+clean/$(LOCAL):
+       -rm -rf $($(@F)-LIST) apt.8
+endif
+
+# Chain to the manpage rule
+SOURCE = apt.8
+include $(MANPAGE_H)

diff --git a/doc/makefile b/doc/makefile
index be8357d8065029c6aba21ed7eda9002844972c68..44a22a597df59cff0cb959612a96fb1638c5de55 100644 (file)
--- a/doc/makefile
+++ b/doc/makefile
@@ -1,7 +1,6 @@
 # -*- make -*-
 BASE=..
 SUBDIR=doc
 # -*- make -*-
 BASE=..
 SUBDIR=doc

-SUBDIRS= $(dir $(wildcard */makefile))

 
 # Bring in the default rules
 include ../buildlib/defaults.mak
 
 # Bring in the default rules
 include ../buildlib/defaults.mak


@@ -13,34 +12,6 @@ include $(DEBIANDOC_H)
 
 doc: manpages debiandoc
 
 
 doc: manpages debiandoc
 

-# Do not use XMLTO, build the manpages directly with XSLTPROC
-ifdef XSLTPROC
-# generate a list of accepted man page translations
-SOURCE = $(patsubst %.xml,%,$(wildcard *.?.xml))
-INCLUDES = apt.ent apt-verbatim.ent
-STYLESHEET=manpage-style.xsl
-
-LOCAL := manpage-$(firstword $(SOURCE))
-$(LOCAL)-LIST := $(SOURCE)
-
-# Install generation hooks
-manpages: $($(LOCAL)-LIST)
-
-$($(LOCAL)-LIST) :: % : %.xml $(STYLESHEET) $(INCLUDES)
-       echo Creating man page $@
-       $(XSLTPROC) -o $@ $(STYLESHEET) $<
-
-# Clean rule
-.PHONY: veryclean/$(LOCAL)
-veryclean: veryclean/$(LOCAL)
-veryclean/$(LOCAL):
-       -rm -rf $($(@F)-LIST)
-endif
-
-# Chain to the manpage rule
-SOURCE = apt.8
-include $(MANPAGE_H)
-

 examples/sources.list: examples/sources.list.in apt-verbatim.ent
        sed -e 's#&stable-codename;#$(shell grep --max-count=1 '^<!ENTITY stable-codename "' apt-verbatim.ent | cut -d'"' -f 2)#g' examples/sources.list.in > examples/sources.list
 
 examples/sources.list: examples/sources.list.in apt-verbatim.ent
        sed -e 's#&stable-codename;#$(shell grep --max-count=1 '^<!ENTITY stable-codename "' apt-verbatim.ent | cut -d'"' -f 2)#g' examples/sources.list.in > examples/sources.list
 


@@ -50,42 +21,43 @@ TO = $(DOC)
 TARGET = binary
 include $(COPY_H)
 
 TARGET = binary
 include $(COPY_H)
 

-.PHONY: clean clean-subdirs veryclean veryclean-subdirs all binary doc stats
+.PHONY: clean clean/subdirs veryclean veryclean/subdirs manpages/subdirs debiandoc/subdirs all binary doc stats

 
 

-clean: clean-subdirs
-veryclean: veryclean-subdirs
+clean: clean/subdirs
+veryclean: veryclean/subdirs
+manpages: manpages/subdirs
+debiandoc: debiandoc/subdirs

 
 

-clean-subdirs:
-       for dir in $(SUBDIRS); do\
-               $(MAKE) -C $$dir clean; \
-       done
+DOCUMENTATIONPO = $(patsubst %.po,%,$(notdir $(wildcard po/*.po)))
+DOCDIRLIST = $(addsuffix /makefile,$(DOCUMENTATIONPO))

 
 

-veryclean-subdirs:
-       for dir in $(SUBDIRS); do\
-               rm -rf $$dir; \
+dirs: $(DOCDIRLIST)
+$(DOCDIRLIST) :: %/makefile : lang.makefile
+       test -d $(dir $@) || mkdir $(dir $@)
+       sed "s#@@LANG@@#$(subst /,,$(dir $@))#" $< > $@
+
+debiandoc/subdirs manpages/subdirs clean/subdirs veryclean/subdirs: dirs
+       for dir in en $(dir $(DOCDIRLIST)); do \
+               $(MAKE) -C $$dir $(patsubst %/subdirs,%,$@); \

        done
 
 stats:
        for i in po/*.po; do echo -n "$$i: "; msgfmt --output-file=/dev/null --statistics $$i; done
 
 ifdef PO4A
        done
 
 stats:
        for i in po/*.po; do echo -n "$$i: "; msgfmt --output-file=/dev/null --statistics $$i; done
 
 ifdef PO4A

-DOCUMENTATIONPO = $(patsubst %.po,%,$(notdir $(wildcard po/*.po)))

 MANPAGEPOLIST = $(addprefix manpages-translation-,$(DOCUMENTATIONPO))
 DEBIANDOCPOLIST = $(addprefix debiandoc-translation-,$(DOCUMENTATIONPO))
 
 MANPAGEPOLIST = $(addprefix manpages-translation-,$(DOCUMENTATIONPO))
 DEBIANDOCPOLIST = $(addprefix debiandoc-translation-,$(DOCUMENTATIONPO))
 

-MANPAGEDIRLIST = $(addsuffix /makefile,$(DOCUMENTATIONPO))
+.PHONY: update-po po4a $(MANPAGEPOLIST) $(DEBIANDOCPOLIST) $(DOCDIRLIST)

 
 

-.PHONY: update-po po4a $(MANPAGEPOLIST) $(MANPAGEDIRLIST)
-
-manpages: $(MANPAGEPOLIST)
-debiandoc: $(DEBIANDOCPOLIST)
-po4a: $(MANPAGEPOLIST) $(DEBIANDOCPOLIST)
+po4a: manpages/subdirs debiandoc/subdirs

 
 update-po:
        po4a --previous --no-backups --force --no-translations \
                --package-name='$(PACKAGE)-doc' --package-version='$(PACKAGE_VERSION)' \
                --msgid-bugs-address='$(PACKAGE_MAIL)' po4a.conf
 
 
 update-po:
        po4a --previous --no-backups --force --no-translations \
                --package-name='$(PACKAGE)-doc' --package-version='$(PACKAGE_VERSION)' \
                --msgid-bugs-address='$(PACKAGE_MAIL)' po4a.conf
 

+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 \
 $(MANPAGEPOLIST) :: manpages-translation-% : %/makefile po4a.conf
        # first line is for apt.8 (see Bug#696923)
        po4a --previous --no-backups --translate-only $(dir $<)apt.ent \


@@ -100,19 +72,13 @@ $(MANPAGEPOLIST) :: manpages-translation-% : %/makefile po4a.conf
                $(patsubst %,--translate-only $(dir $<)%,$(patsubst %.8.xml,%.$(subst /,,$(dir $<)).8.xml,$(wildcard *.8.xml))) \
                --package-name='$(PACKAGE)-doc' --package-version='$(PACKAGE_VERSION)' \
                --msgid-bugs-address='$(PACKAGE_MAIL)' po4a.conf
                $(patsubst %,--translate-only $(dir $<)%,$(patsubst %.8.xml,%.$(subst /,,$(dir $<)).8.xml,$(wildcard *.8.xml))) \
                --package-name='$(PACKAGE)-doc' --package-version='$(PACKAGE_VERSION)' \
                --msgid-bugs-address='$(PACKAGE_MAIL)' po4a.conf

-       $(MAKE) -C $(dir $<) manpages

 
 

+debiandoc/subdirs: $(DEBIANDOCPOLIST)

 $(DEBIANDOCPOLIST) :: debiandoc-translation-% : %/makefile po4a.conf
        po4a --previous --no-backups --translate-only $(dir $<)apt.ent \
                $(patsubst %,--translate-only $(dir $<)%,$(patsubst %.sgml,%.$(subst /,,$(dir $<)).sgml,$(wildcard *.sgml))) \
                --package-name='$(PACKAGE)-doc' --package-version='$(PACKAGE_VERSION)' \
                --msgid-bugs-address='$(PACKAGE_MAIL)' po4a.conf
 $(DEBIANDOCPOLIST) :: debiandoc-translation-% : %/makefile po4a.conf
        po4a --previous --no-backups --translate-only $(dir $<)apt.ent \
                $(patsubst %,--translate-only $(dir $<)%,$(patsubst %.sgml,%.$(subst /,,$(dir $<)).sgml,$(wildcard *.sgml))) \
                --package-name='$(PACKAGE)-doc' --package-version='$(PACKAGE_VERSION)' \
                --msgid-bugs-address='$(PACKAGE_MAIL)' po4a.conf

-       $(MAKE) -C $(dir $<) debiandoc
-
-dirs: $(MANPAGEDIRLIST)
-$(MANPAGEDIRLIST) :: %/makefile : lang.makefile
-       test -d $(dir $@) || mkdir $(dir $@)
-       sed "s#@@LANG@@#$(subst /,,$(dir $@))#" $< > $@

 endif
 
 ifdef DOXYGEN
 endif
 
 ifdef DOXYGEN