From 915e78ee2d8437da0e94a1557d65df8823e4d9d1 Mon Sep 17 00:00:00 2001 From: nekral-guest Date: Sun, 30 Aug 2009 19:46:54 +0000 Subject: [PATCH] * 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. --- ChangeLog | 6 ++++++ man/generate_mans.mak | 9 +++++---- man/generate_translations.mak | 11 ++++++----- 3 files changed, 17 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 33742d48..d6742045 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2009-08-30 Mike Frysinger + + * 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 * man/login.defs.d/ENCRYPT_METHOD.xml: Avoid using sub-lists. They diff --git a/man/generate_mans.mak b/man/generate_mans.mak index ec3f6d76..2fd2e214 100644 --- a/man/generate_mans.mak +++ b/man/generate_mans.mak @@ -1,5 +1,3 @@ -if ENABLE_REGENERATE_MAN - if USE_PAM PAM_COND=pam else @@ -18,13 +16,16 @@ SHA_CRYPT_COND=no_sha_crypt 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 diff --git a/man/generate_translations.mak b/man/generate_translations.mak index b3b671e8..95256f14 100644 --- a/man/generate_translations.mak +++ b/man/generate_translations.mak @@ -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:\(^:\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