* man/generate_translations.mak, man/generate_mans.mak,

	po/Makefile.in.in: Removing and restoring the config.xml file
	broke parallel builds. Build the manpages based on *.xml-config
	files instead of *.xml files.  The *.xml do not include config.xml
	anymore, which permits to run xml2po without needing to remove
	config.xml. The config.xml is restored in the *.xml-config files.
	* man/groupadd.8.xml: Implementation of the above.
	* man/generate_mans.deps: Updated dependencies

diff --git a/ChangeLog b/ChangeLog
index bee9c2c9c605302cd1a43b6eb424d5c7d9e4b689..26610452e505b6f2562ec53b63cd67b5c31286f0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2009-09-07  Nicolas François  <nicolas.francois@centraliens.net>
+
+       * man/generate_translations.mak, man/generate_mans.mak,
+       po/Makefile.in.in: Removing and restoring the config.xml file
+       broke parallel builds. Build the manpages based on *.xml-config
+       files instead of *.xml files.  The *.xml do not include config.xml
+       anymore, which permits to run xml2po without needing to remove
+       config.xml. The config.xml is restored in the *.xml-config files.
+       * man/groupadd.8.xml: Implementation of the above.
+       * man/generate_mans.deps: Updated dependencies
+
 2009-09-07  Steve Grubb  <sgrubb@redhat.com>
 
        * libmisc/limits.c: Fix the format to match the unsigned long

diff --git a/man/generate_mans.deps b/man/generate_mans.deps
index 3cf89749d83de1ea48718e563d864dbf40a935a5..264fa0acf60984820b7a4d7515cd6ed9e90eb3bd 100644 (file)
--- a/man/generate_mans.deps
+++ b/man/generate_mans.deps
@@ -17,7 +17,6 @@ gpasswd.1: login.defs.d/SHA_CRYPT_MIN_ROUNDS.xml
 groupadd.8: login.defs.d/GID_MAX.xml
 groupadd.8: login.defs.d/MAX_MEMBERS_PER_GROUP.xml
 groupadd.8: login.defs.d/SYS_GID_MAX.xml
-groupadd.8: config.xml
 groupdel.8: login.defs.d/MAX_MEMBERS_PER_GROUP.xml
 groupmems.8: login.defs.d/MAX_MEMBERS_PER_GROUP.xml
 groupmod.8: login.defs.d/MAX_MEMBERS_PER_GROUP.xml

diff --git a/man/generate_mans.mak b/man/generate_mans.mak
index 2fd2e2145ef7154c2678c0cebfd5e668e556b2ca..9d4c83e57a8abcaf9bbd6976f06252beaa86a6f0 100644 (file)
--- a/man/generate_mans.mak
+++ b/man/generate_mans.mak
@@ -15,7 +15,10 @@ else
 SHA_CRYPT_COND=no_sha_crypt
 endif
 
-%: %.xml Makefile config.xml
+%.xml-config: %.xml Makefile
+       sed -e 's/^<!-- SHADOW-CONFIG-HERE -->/<!ENTITY % config SYSTEM "config.xml">%config;/' $< > $@
+
+%: %.xml-config Makefile config.xml
 if ENABLE_REGENERATE_MAN
        $(XSLTPROC) --stringparam profile.condition "$(PAM_COND);$(SHADOWGRP_COND);$(SHA_CRYPT_COND)" \
                    -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/profile-docbook.xsl $<

diff --git a/man/generate_translations.mak b/man/generate_translations.mak
index 95256f14003aec5ae164b6aa2140bc3cfde70088..7344d8dd96ee70d1c24627b50d3e721445395eda 100644 (file)
--- a/man/generate_translations.mak
+++ b/man/generate_translations.mak
@@ -2,11 +2,8 @@ LANG=$(notdir $(CURDIR))
 
 %.xml: ../%.xml ../po/$(LANG).po
 if ENABLE_REGENERATE_MAN
-       [ ! -f ../config.xml ] || mv ../config.xml ../config.xml.bak
        xml2po --expand-all-entities -l $(LANG) -p ../po/$(LANG).po -o $@ ../$@
        sed -i 's:\(^<refentry .*\)>:\1 lang="$(LANG)">:' $@
-       [ ! -f ../config.xml.bak ] || mv ../config.xml.bak ../config.xml
-       sed -i 's/config SYSTEM "config.xml">/config SYSTEM "config.xml">\%config;/' $@
 else
        @echo you need to run configure with --enable-man to generate man pages
        @false

diff --git a/man/groupadd.8.xml b/man/groupadd.8.xml
index 59da57a2cd3d76efbd985940a3dede3e9dadb2e8..133e89d3a65f5f29753c04b1fca62e2e28b4c4b1 100644 (file)
--- a/man/groupadd.8.xml
+++ b/man/groupadd.8.xml
@@ -33,8 +33,7 @@
 <!ENTITY GID_MAX               SYSTEM "login.defs.d/GID_MAX.xml">
 <!ENTITY MAX_MEMBERS_PER_GROUP SYSTEM "login.defs.d/MAX_MEMBERS_PER_GROUP.xml">
 <!ENTITY SYS_GID_MAX           SYSTEM "login.defs.d/SYS_GID_MAX.xml">
-<!ENTITY % config SYSTEM "config.xml">
-%config;
+<!-- SHADOW-CONFIG-HERE -->
 ]>
 <refentry id='groupadd.8'>
   <!-- $Id$ -->

diff --git a/man/po/Makefile.in.in b/man/po/Makefile.in.in
index 93b4b7578e5acc5a8ff1e588da916468215b0538..1e83addd1dd3f2a98cd2fde46d2c7ac6b32efb42 100644 (file)
--- a/man/po/Makefile.in.in
+++ b/man/po/Makefile.in.in
@@ -94,12 +94,8 @@ $(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed
        @set -e; tmpdir=`pwd`; \
        echo "cd $(top_srcdir)/man"; \
        cd $(top_srcdir)/man; \
-       echo "[ ! -f config.xml ] || mv config.xml config.xml.bak"; \
-       [ ! -f config.xml ] || mv config.xml config.xml.bak; \
        echo "xml2po --expand-all-entities -o $$tmpdir/$(DOMAIN).po $(notdir $(POTFILES))"; \
        xml2po --expand-all-entities -o $$tmpdir/$(DOMAIN).po $(notdir $(POTFILES)); \
-       echo "[ ! -f config.xml.bak ] || mv config.xml.bak config.xml"; \
-       [ ! -f config.xml.bak ] || mv config.xml.bak config.xml; \
        cd $$tmpdir
        test ! -f $(DOMAIN).po || { \
          if test -f $(srcdir)/$(DOMAIN).pot; then \