From: nekral-guest <nekral-guest@5a98b0ae-9ef6-0310-add3-de5d479b70d7>
Date: Sat, 20 Mar 2010 10:25:34 +0000 (+0000)
Subject: 	* man/generate_translations.mak, man/generate_mans.mak: Fix
X-Git-Tag: 4.1.5~290
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d1eae4c7e30fc2521cd728533893a6071e9a5de1;p=shadow

	* man/generate_translations.mak, man/generate_mans.mak: Fix
	distcheck. All manpages generation code shall be enclosed in
	ENABLE_REGENERATE_MAN conditions.
---

diff --git a/ChangeLog b/ChangeLog
index 0e44b437..3166e904 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-03-20  Nicolas François  <nicolas.francois@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@centraliens.net>
 
 	* man/useradd.8.xml: Do not document the features which are not
diff --git a/man/generate_mans.mak b/man/generate_mans.mak
index 82fcfcdb..8854f5dc 100644
--- a/man/generate_mans.mak
+++ b/man/generate_mans.mak
@@ -20,14 +20,15 @@ else
 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
diff --git a/man/generate_translations.mak b/man/generate_translations.mak
index 7344d8dd..ab673694 100644
--- a/man/generate_translations.mak
+++ b/man/generate_translations.mak
@@ -1,18 +1,20 @@
 LANG=$(notdir $(CURDIR))
 
-%.xml: ../%.xml ../po/$(LANG).po
 if ENABLE_REGENERATE_MAN
+config.xml: ../config.xml.in
+	$(MAKE) -C .. config.xml
+	cp ../config.xml $@
+
+%.xml: ../%.xml ../po/$(LANG).po
 	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))