* man/po/Makefile.in.in: xml2po cannot exclude one entity for

expansion. Make sure config.xml does not exist when the POT file
	is created in order to keep the configurations in the POT file
	* man/generate_translations.mak: make sure config.xml does not
	exist neither when the translated XML is generated. Add the
	missing %config; (strip out by xml2po). and make sure config.xml
	is present when the translated manpage is generated.
	* man/generate_mans.mak: config.xml is needed for the generation
	of manpages (already in the .deps for the English manpages, but
	needed for the translations).
	* man/Makefile.am: Added missing CREATE_HOME.xml.
This commit is contained in:
nekral-guest 2009-03-14 16:18:06 +00:00
parent 526e7ac972
commit d1dac25379
5 changed files with 30 additions and 4 deletions

View File

@ -1,3 +1,17 @@
2009-03-14 Nicolas François <nicolas.francois@centraliens.net>
* man/po/Makefile.in.in: xml2po cannot exclude one entity for
expansion. Make sure config.xml does not exist when the POT file
is created in order to keep the configurations in the POT file
* man/generate_translations.mak: make sure config.xml does not
exist neither when the translated XML is generated. Add the
missing %config; (strip out by xml2po). and make sure config.xml
is present when the translated manpage is generated.
* man/generate_mans.mak: config.xml is needed for the generation
of manpages (already in the .deps for the English manpages, but
needed for the translations).
* man/Makefile.am: Added missing CREATE_HOME.xml.
2009-03-14 Nicolas François <nicolas.francois@centraliens.net> 2009-03-14 Nicolas François <nicolas.francois@centraliens.net>
* etc/login.defs: Added note for PAM enabled configurations. * etc/login.defs: Added note for PAM enabled configurations.

View File

@ -105,6 +105,7 @@ login_defs_v = \
CHSH_AUTH.xml \ CHSH_AUTH.xml \
CONSOLE.xml \ CONSOLE.xml \
CONSOLE_GROUPS.xml \ CONSOLE_GROUPS.xml \
CREATE_HOME.xml \
DEFAULT_HOME.xml \ DEFAULT_HOME.xml \
ENCRYPT_METHOD.xml \ ENCRYPT_METHOD.xml \
ENV_HZ.xml \ ENV_HZ.xml \

View File

@ -17,7 +17,7 @@ else
SHA_CRYPT_COND=no_sha_crypt SHA_CRYPT_COND=no_sha_crypt
endif endif
%: %.xml Makefile %: %.xml Makefile config.xml
$(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 $<

View File

@ -3,8 +3,15 @@ if ENABLE_REGENERATE_MAN
LANG=$(notdir $(CURDIR)) LANG=$(notdir $(CURDIR))
%.xml: ../%.xml ../po/$(LANG).po %.xml: ../%.xml ../po/$(LANG).po
[ ! -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;/' $@
config.xml: ../config.xml.in
make -C .. config.xml
cp ../config.xml $@
include ../generate_mans.mak include ../generate_mans.mak

View File

@ -91,11 +91,15 @@ stamp-po: $(srcdir)/$(DOMAIN).pot
# Note that $(DOMAIN).pot is not touched if it doesn't need to be changed. # Note that $(DOMAIN).pot is not touched if it doesn't need to be changed.
# TODO: set MSGID_BUGS_ADDRESS, COPYRIGHT_HOLDER # TODO: set MSGID_BUGS_ADDRESS, COPYRIGHT_HOLDER
$(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed $(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed
@tmpdir=`pwd`; \ @set -e; tmpdir=`pwd`; \
echo -n "cd $(top_srcdir)/man && "; \ echo "cd $(top_srcdir)/man"; \
echo "xml2po --expand-all-entities -o $(tmpdir)/$(DOMAIN).po $(notdir $(POTFILES))"; \
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)); \ 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 \