* 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.

diff --git a/ChangeLog b/ChangeLog
index 85deae617cfed278987d1d6e8d196dc98e6b2914..f9eec05cc8653891a5e1f190b27dd96a7c3b0dd8 100644 (file)
--- 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  <nicolas.francois@centraliens.net>
 

diff --git a/man/Makefile.am b/man/Makefile.am
index d5557c5e68a16912b6337505fcc779e19227e93b..41eaf10adc20421e4df1b25ea7b7f6cac2d28562 100644 (file)
--- 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:\(^<refentry .*\)>:\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 458fe0428ce59c2720922637ba49f1723f068ede..79366e86f688bdddf321a2298d6ac26103b18dbc 100644 (file)
--- 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 19a761d687defdd1de725a7d428288e33d83b05c..0f865b2d0466048fd48e5459bf80d5cc8c332fc8 100644 (file)
--- 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 (file)
index 0000000..c4e83e3
--- /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:\(^<refentry .*\)>:\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 932a4f90b0df4a67f5b0545dc628b2770486a11b..d1b4f57ced10eaef23c347f0af6a5285ba1b372a 100644 (file)
--- 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 6394c0c9cbbbe53237e313f5c4d46e43d7b481c5..793462c44ff5644dbe7e85276a9a5419243f5eb1 100644 (file)
--- 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 d58f03b36285a04853dbb2a102c3c0ee1114428f..9e9d445a3411c7c74f3c4598dbfa1030ac199013 100644 (file)
--- 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 4b8616f818584c837cd1eb58f62fbe87e828038f..cc69383aff034f9f0b32f393d95e8f0592e9ae7f 100644 (file)
--- 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
+