+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>
* etc/login.defs: Added note for PAM enabled configurations.
CHSH_AUTH.xml \
CONSOLE.xml \
CONSOLE_GROUPS.xml \
+ CREATE_HOME.xml \
DEFAULT_HOME.xml \
ENCRYPT_METHOD.xml \
ENV_HZ.xml \
SHA_CRYPT_COND=no_sha_crypt
endif
-%: %.xml Makefile
+%: %.xml Makefile config.xml
$(XSLTPROC) --stringparam profile.condition "$(PAM_COND);$(SHADOWGRP_COND);$(SHA_CRYPT_COND)" \
-nonet http://docbook.sourceforge.net/release/xsl/current/manpages/profile-docbook.xsl $<
LANG=$(notdir $(CURDIR))
%.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 $@ ../$@
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
# Note that $(DOMAIN).pot is not touched if it doesn't need to be changed.
# TODO: set MSGID_BUGS_ADDRESS, COPYRIGHT_HOLDER
$(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed
- @tmpdir=`pwd`; \
- echo -n "cd $(top_srcdir)/man && "; \
- echo "xml2po --expand-all-entities -o $(tmpdir)/$(DOMAIN).po $(notdir $(POTFILES))"; \
+ @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 \