[Pkg-shadow-commits] r3479 - in upstream/trunk: . man
Nicolas FRANÇOIS
nekral-guest at alioth.debian.org
Sun Sep 18 17:02:11 UTC 2011
Author: nekral-guest
Date: 2011-09-18 17:02:10 +0000 (Sun, 18 Sep 2011)
New Revision: 3479
Modified:
upstream/trunk/ChangeLog
upstream/trunk/man/generate_mans.mak
Log:
* man/generate_mans.mak: Fix the generation of translated man
pages. xml2po removed the comment from empty headers and the
config was no more inserted.
Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog 2011-09-18 17:00:28 UTC (rev 3478)
+++ upstream/trunk/ChangeLog 2011-09-18 17:02:10 UTC (rev 3479)
@@ -1,5 +1,11 @@
2011-09-18 Nicolas François <nicolas.francois at centraliens.net>
+ * man/generate_mans.mak: Fix the generation of translated man
+ pages. xml2po removed the comment from empty headers and the
+ config was no more inserted.
+
+2011-09-18 Nicolas François <nicolas.francois at centraliens.net>
+
* man/chage.1.xml: The LOGIN argument is not optional.
* man/login.defs.d/QUOTAS_ENAB.xml: Document the dependency
between /etc/limits and QUOTAS_ENAB.
Modified: upstream/trunk/man/generate_mans.mak
===================================================================
--- upstream/trunk/man/generate_mans.mak 2011-09-18 17:00:28 UTC (rev 3478)
+++ upstream/trunk/man/generate_mans.mak 2011-09-18 17:02:10 UTC (rev 3479)
@@ -22,7 +22,11 @@
if ENABLE_REGENERATE_MAN
%.xml-config: %.xml Makefile
- sed -e 's/^<!-- SHADOW-CONFIG-HERE -->/<!ENTITY % config SYSTEM "config.xml">%config;/' $< > $@
+ if grep -q SHADOW-CONFIG-HERE $<; then \
+ sed -e 's/^<!-- SHADOW-CONFIG-HERE -->/<!ENTITY % config SYSTEM "config.xml">%config;/' $< > $@; \
+ else \
+ sed -e 's/^\(<!DOCTYPE .*docbookx.dtd"\)>/\1 [<!ENTITY % config SYSTEM "config.xml">%config;]>/' $< > $@; \
+ fi
%: %.xml-config Makefile config.xml
$(XSLTPROC) --stringparam profile.condition "$(PAM_COND);$(SHADOWGRP_COND);$(TCB_COND);$(SHA_CRYPT_COND)" \
More information about the Pkg-shadow-commits
mailing list