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

[Nicolas FRANÇOIS]

Author: nekral-guest
Date: 2009-08-30 19:46:54 +0000 (Sun, 30 Aug 2009)
New Revision: 3052

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/man/generate_mans.mak
   upstream/trunk/man/generate_translations.mak
Log:
	* man/generate_mans.mak, man/generate_translations.mak: Provide an
	useful error message when --enable-man is not enabled and the
	translated manpages are not generated.


Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2009-08-21 15:17:09 UTC (rev 3051)
+++ upstream/trunk/ChangeLog	2009-08-30 19:46:54 UTC (rev 3052)
@@ -1,3 +1,9 @@
+2009-08-30  Mike Frysinger  <vapier at gentoo.org>
+
+	* man/generate_mans.mak, man/generate_translations.mak: Provide an
+	useful error message when --enable-man is not enabled and the
+	translated manpages are not generated.
+
 2009-08-21  Nicolas François  <nicolas.francois at centraliens.net>
 
 	* man/login.defs.d/ENCRYPT_METHOD.xml: Avoid using sub-lists. They

Modified: upstream/trunk/man/generate_mans.mak
===================================================================
--- upstream/trunk/man/generate_mans.mak	2009-08-21 15:17:09 UTC (rev 3051)
+++ upstream/trunk/man/generate_mans.mak	2009-08-30 19:46:54 UTC (rev 3052)
@@ -1,5 +1,3 @@
-if ENABLE_REGENERATE_MAN
-
 if USE_PAM
 PAM_COND=pam
 else
@@ -18,13 +16,16 @@
 endif
 
 %: %.xml Makefile config.xml
+if ENABLE_REGENERATE_MAN
 	$(XSLTPROC) --stringparam profile.condition "$(PAM_COND);$(SHADOWGRP_COND);$(SHA_CRYPT_COND)" \
 	            -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/profile-docbook.xsl $<
+else
+	@echo you need to run configure with --enable-man to generate man pages
+	@false
+endif
 
 grpconv.8 grpunconv.8 pwunconv.8: pwconv.8
 
 getspnam.3: shadow.3
 
 vigr.8: vipw.8
-
-endif

Modified: upstream/trunk/man/generate_translations.mak
===================================================================
--- upstream/trunk/man/generate_translations.mak	2009-08-21 15:17:09 UTC (rev 3051)
+++ upstream/trunk/man/generate_translations.mak	2009-08-30 19:46:54 UTC (rev 3052)
@@ -1,20 +1,21 @@
-if ENABLE_REGENERATE_MAN
-
 LANG=$(notdir $(CURDIR))
 
 %.xml: ../%.xml ../po/$(LANG).po
+if ENABLE_REGENERATE_MAN
 	[ ! -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;/' $@
+else
+	@echo you need to run configure with --enable-man to generate man pages
+	@false
+endif
 
 config.xml: ../config.xml.in
-	make -C .. config.xml
+	$(MAKE) -C .. config.xml
 	cp ../config.xml $@
 
 include ../generate_mans.mak
 
 CLEANFILES = .xml2po.mo $(EXTRA_DIST) $(addsuffix .xml,$(EXTRA_DIST))
-
-endif