From 0d00d3eecf790f8ae89cd9c87e9c77d9149be973 Mon Sep 17 00:00:00 2001 From: nekral-guest Date: Sun, 18 Sep 2011 17:02:10 +0000 Subject: [PATCH] * 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. --- ChangeLog | 6 ++++++ man/generate_mans.mak | 6 +++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 251b4c7e..9ad939a6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2011-09-18 Nicolas François + + * 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 * man/chage.1.xml: The LOGIN argument is not optional. diff --git a/man/generate_mans.mak b/man/generate_mans.mak index 8854f5dc..09631f49 100644 --- a/man/generate_mans.mak +++ b/man/generate_mans.mak @@ -22,7 +22,11 @@ endif if ENABLE_REGENERATE_MAN %.xml-config: %.xml Makefile - sed -e 's/^/%config;/' $< > $@ + if grep -q SHADOW-CONFIG-HERE $<; then \ + sed -e 's/^/%config;/' $< > $@; \ + else \ + sed -e 's/^\(/\1 [%config;]>/' $< > $@; \ + fi %: %.xml-config Makefile config.xml $(XSLTPROC) --stringparam profile.condition "$(PAM_COND);$(SHADOWGRP_COND);$(TCB_COND);$(SHA_CRYPT_COND)" \