[Pkg-shadow-commits] r3172 - in upstream/trunk: . man

[Nicolas FRANÇOIS]

Author: nekral-guest
Date: 2010-03-20 10:25:34 +0000 (Sat, 20 Mar 2010)
New Revision: 3172

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/man/generate_mans.mak
   upstream/trunk/man/generate_translations.mak
Log:
	* man/generate_translations.mak, man/generate_mans.mak: Fix
	distcheck. All manpages generation code shall be enclosed in
	ENABLE_REGENERATE_MAN conditions.


Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2010-03-20 10:23:57 UTC (rev 3171)
+++ upstream/trunk/ChangeLog	2010-03-20 10:25:34 UTC (rev 3172)
@@ -1,5 +1,11 @@
 2010-03-20  Nicolas François  <nicolas.francois at centraliens.net>
 
+	* man/generate_translations.mak, man/generate_mans.mak: Fix
+	distcheck. All manpages generation code shall be enclosed in
+	ENABLE_REGENERATE_MAN conditions.
+
+2010-03-20  Nicolas François  <nicolas.francois at centraliens.net>
+
 	* man/useradd.8.xml: Do not document the features which are not
 	working.
 	* man/useradd.8.xml: Fix typo: -u was meant instead of -o.

Modified: upstream/trunk/man/generate_mans.mak
===================================================================
--- upstream/trunk/man/generate_mans.mak	2010-03-20 10:23:57 UTC (rev 3171)
+++ upstream/trunk/man/generate_mans.mak	2010-03-20 10:25:34 UTC (rev 3172)
@@ -20,14 +20,15 @@
 SHA_CRYPT_COND=no_sha_crypt
 endif
 
+if ENABLE_REGENERATE_MAN
 %.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
 	$(XSLTPROC) --stringparam profile.condition "$(PAM_COND);$(SHADOWGRP_COND);$(TCB_COND);$(SHA_CRYPT_COND)" \
 	            -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/profile-docbook.xsl $<
 else
+$(man_MANS):
 	@echo you need to run configure with --enable-man to generate man pages
 	@false
 endif

Modified: upstream/trunk/man/generate_translations.mak
===================================================================
--- upstream/trunk/man/generate_translations.mak	2010-03-20 10:23:57 UTC (rev 3171)
+++ upstream/trunk/man/generate_translations.mak	2010-03-20 10:25:34 UTC (rev 3172)
@@ -1,18 +1,20 @@
 LANG=$(notdir $(CURDIR))
 
+if ENABLE_REGENERATE_MAN
+config.xml: ../config.xml.in
+	$(MAKE) -C .. config.xml
+	cp ../config.xml $@
+
 %.xml: ../%.xml ../po/$(LANG).po
-if ENABLE_REGENERATE_MAN
 	xml2po --expand-all-entities -l $(LANG) -p ../po/$(LANG).po -o $@ ../$@
 	sed -i 's:\(^<refentry .*\)>:\1 lang="$(LANG)">:' $@
+
+include ../generate_mans.mak
+
 else
+$(man_MANS):
 	@echo you need to run configure with --enable-man to generate man pages
 	@false
 endif
 
-config.xml: ../config.xml.in
-	$(MAKE) -C .. config.xml
-	cp ../config.xml $@
-
-include ../generate_mans.mak
-
 CLEANFILES = .xml2po.mo $(EXTRA_DIST) $(addsuffix .xml,$(EXTRA_DIST))