From cbb2911b7ffdc874c6450cdb72c9a471ba5ad261 Mon Sep 17 00:00:00 2001 From: nekral-guest Date: Sat, 17 Nov 2007 18:45:22 +0000 Subject: [PATCH] * man/generate_translations.mak: Generic rules for all the generated translated manpages (if ENABLE_REGENERATE_MAN). * man/Makefile.am: Removed rules for all the generated translated manpages. * man/sv/Makefile.am, man/de/Makefile.am, man/fr/Makefile.am, man/pl/Makefile.am, man/ru/Makefile.am, man/it/Makefile.am: Include generate_translations.mak to handle the generated translations (XML and roff files). * man/Makefile.am: Translated XML files moved from the CLEANFILES variable of man/Makefile.am to the various languages Makefiles. --- ChangeLog | 10 ++++++++++ man/Makefile.am | 11 ++--------- man/de/Makefile.am | 3 +++ man/fr/Makefile.am | 3 +++ man/generate_translations.mak | 20 ++++++++++++++++++++ man/it/Makefile.am | 2 ++ man/pl/Makefile.am | 3 +++ man/ru/Makefile.am | 3 +++ man/sv/Makefile.am | 3 +++ 9 files changed, 49 insertions(+), 9 deletions(-) create mode 100644 man/generate_translations.mak diff --git a/ChangeLog b/ChangeLog index 85deae61..f9eec05c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -13,6 +13,16 @@ * man/Makefile.am: Replace the individual rules for the generation of the manpages (from XML) by a generic Makefile rule an dependencies for the linked manpages. + * man/generate_translations.mak: Generic rules for all the + generated translated manpages (if ENABLE_REGENERATE_MAN). + * man/Makefile.am: Removed rules for all the generated translated + manpages. + * man/sv/Makefile.am, man/de/Makefile.am, man/fr/Makefile.am, + man/pl/Makefile.am, man/ru/Makefile.am, man/it/Makefile.am: + Include generate_translations.mak to handle the generated + translations (XML and roff files). + * man/Makefile.am: Translated XML files moved from the CLEANFILES + variable of man/Makefile.am to the various languages Makefiles. 2007-11-17 Nicolas François diff --git a/man/Makefile.am b/man/Makefile.am index d5557c5e..41eaf10a 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -123,18 +123,11 @@ getspnam.3: shadow.3 vigr.8: vipw.8 -CLEANFILES = $(man_MANS) $(ALL_TRANSLATED_XMLS) +CLEANFILES = $(man_MANS) POFILES = $(foreach lang, $(LINGUAS), $(lang)/$(lang).po) -ALL_TRANSLATED_XMLS = $(foreach dir, $(LINGUAS), $(foreach xmlfile, $(man_XMANS), $(dir)/$(xmlfile))) -all: $(POFILES) $(ALL_TRANSLATED_XMLS) - -gen-xmls: $(ALL_TRANSLATED_XMLS) - -$(ALL_TRANSLATED_XMLS): $(man_XMANS) - xml2po -l $(strip $(subst /,, $(dir $@))) -p $(strip $(subst /,, $(dir $@)))/$(strip $(subst /,, $(dir $@))).po -o $@ $(notdir $@) - sed -i 's:\(^:\1 lang="$(strip $(subst /,, $(dir $@)))">:' $@ +all: $(POFILES) $(POFILES): shadow-man-pages.pot diff --git a/man/de/Makefile.am b/man/de/Makefile.am index 458fe042..79366e86 100644 --- a/man/de/Makefile.am +++ b/man/de/Makefile.am @@ -13,3 +13,6 @@ man_MANS = \ vipw.8 EXTRA_DIST = $(man_MANS) + +include ../generate_translations.mak + diff --git a/man/fr/Makefile.am b/man/fr/Makefile.am index 19a761d6..0f865b2d 100644 --- a/man/fr/Makefile.am +++ b/man/fr/Makefile.am @@ -53,3 +53,6 @@ endif EXTRA_DIST = \ $(man_MANS) \ $(man_nopam) + +include ../generate_translations.mak + diff --git a/man/generate_translations.mak b/man/generate_translations.mak new file mode 100644 index 00000000..c4e83e32 --- /dev/null +++ b/man/generate_translations.mak @@ -0,0 +1,20 @@ +if ENABLE_REGENERATE_MAN + +LANG=$(notdir $(CURDIR)) + +%.xml: ../%.xml $(LANG).po + xml2po -l $(LANG) -p $(LANG).po -o $@ ../$@ + sed -i 's:\(^:\1 lang="$(LANG)">:' $@ + +%: %.xml + $(XSLTPROC) -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $< + +grpconv.8 grpunconv.8 pwunconv.8: pwconv.8 + +getspnam.3: shadow.3 + +vigr.8: vipw.8 + +CLEANFILES = .xml2po.mo $(man_MANS) $(addsuffix .xml,$(man_MANS)) + +endif diff --git a/man/it/Makefile.am b/man/it/Makefile.am index 932a4f90..d1b4f57c 100644 --- a/man/it/Makefile.am +++ b/man/it/Makefile.am @@ -49,3 +49,5 @@ EXTRA_DIST = \ $(man_nopam) \ id.1 +include ../generate_translations.mak + diff --git a/man/pl/Makefile.am b/man/pl/Makefile.am index 6394c0c9..793462c4 100644 --- a/man/pl/Makefile.am +++ b/man/pl/Makefile.am @@ -54,3 +54,6 @@ EXTRA_DIST = \ id.1 \ shadow.3 \ sulogin.8 + +include ../generate_translations.mak + diff --git a/man/ru/Makefile.am b/man/ru/Makefile.am index d58f03b3..9e9d445a 100644 --- a/man/ru/Makefile.am +++ b/man/ru/Makefile.am @@ -58,3 +58,6 @@ EXTRA_DIST = \ $(man_nopam) \ id.1 \ sulogin.8 + +include ../generate_translations.mak + diff --git a/man/sv/Makefile.am b/man/sv/Makefile.am index 4b8616f8..cc69383a 100644 --- a/man/sv/Makefile.am +++ b/man/sv/Makefile.am @@ -55,3 +55,6 @@ endif EXTRA_DIST = \ $(man_MANS) \ $(man_nopam) + +include ../generate_translations.mak +