emo/shadow
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

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

Browse Source 
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
This commit is contained in:
nekral-guest 2009-09-07 21:49:29 +00:00
parent 031279dfb2
commit f103e6263d
6 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@ -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> 2009-09-07 Steve Grubb <sgrubb@redhat.com>
* libmisc/limits.c: Fix the format to match the unsigned long * libmisc/limits.c: Fix the format to match the unsigned long

1
man/generate_mans.deps
View File

@ -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/GID_MAX.xml
groupadd.8: login.defs.d/MAX_MEMBERS_PER_GROUP.xml groupadd.8: login.defs.d/MAX_MEMBERS_PER_GROUP.xml
groupadd.8: login.defs.d/SYS_GID_MAX.xml groupadd.8: login.defs.d/SYS_GID_MAX.xml
groupadd.8: config.xml
groupdel.8: login.defs.d/MAX_MEMBERS_PER_GROUP.xml groupdel.8: login.defs.d/MAX_MEMBERS_PER_GROUP.xml
groupmems.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 groupmod.8: login.defs.d/MAX_MEMBERS_PER_GROUP.xml

5
man/generate_mans.mak
View File

@ -15,7 +15,10 @@ else
SHA_CRYPT_COND=no_sha_crypt SHA_CRYPT_COND=no_sha_crypt
endif 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 if ENABLE_REGENERATE_MAN
$(XSLTPROC) --stringparam profile.condition "$(PAM_COND);$(SHADOWGRP_COND);$(SHA_CRYPT_COND)" \ $(XSLTPROC) --stringparam profile.condition "$(PAM_COND);$(SHADOWGRP_COND);$(SHA_CRYPT_COND)" \
-nonet http://docbook.sourceforge.net/release/xsl/current/manpages/profile-docbook.xsl $< -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/profile-docbook.xsl $<

3
man/generate_translations.mak
View File

@ -2,11 +2,8 @@ LANG=$(notdir $(CURDIR))
%.xml: ../%.xml ../po/$(LANG).po %.xml: ../%.xml ../po/$(LANG).po
if ENABLE_REGENERATE_MAN if ENABLE_REGENERATE_MAN
[ ! -f ../config.xml ] || mv ../config.xml ../config.xml.bak
xml2po --expand-all-entities -l $(LANG) -p ../po/$(LANG).po -o $@ ../$@ xml2po --expand-all-entities -l $(LANG) -p ../po/$(LANG).po -o $@ ../$@
sed -i 's:\(^<refentry .*\)>:\1 lang="$(LANG)">:' $@ 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 else
@echo you need to run configure with --enable-man to generate man pages @echo you need to run configure with --enable-man to generate man pages
@false @false

3
man/groupadd.8.xml
View File

@ -33,8 +33,7 @@
<!ENTITY GID_MAX SYSTEM "login.defs.d/GID_MAX.xml"> <!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 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 SYS_GID_MAX SYSTEM "login.defs.d/SYS_GID_MAX.xml">
<!ENTITY % config SYSTEM "config.xml"> <!-- SHADOW-CONFIG-HERE -->
%config;
]> ]>
<refentry id='groupadd.8'> <refentry id='groupadd.8'>
<!-- $Id$ --> <!-- $Id$ -->

4
man/po/Makefile.in.in
View File

@ -94,12 +94,8 @@ $(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed
@set -e; tmpdir=`pwd`; \ @set -e; tmpdir=`pwd`; \
echo "cd $(top_srcdir)/man"; \ echo "cd $(top_srcdir)/man"; \
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))"; \ echo "xml2po --expand-all-entities -o $$tmpdir/$(DOMAIN).po $(notdir $(POTFILES))"; \
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 cd $$tmpdir
test ! -f $(DOMAIN).po || { \ test ! -f $(DOMAIN).po || { \
if test -f $(srcdir)/$(DOMAIN).pot; then \ if test -f $(srcdir)/$(DOMAIN).pot; then \