From: Bruno Haible <bruno@clisp.org>
Date: Sat, 24 Feb 2007 07:51:19 +0000 (+0100)
Subject: Handle better the combination of old Perl and a pre-c99 compiler.
X-Git-Tag: COREUTILS-6_8~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=63813d09502001302b3da8cb366ad3a4967bafc7;p=thirdparty%2Fcoreutils.git

Handle better the combination of old Perl and a pre-c99 compiler.
* man/Makefile.am (.x.1): If the autoconf test has determined that
perl is missing or not a sufficient version, do nothing.
---

diff --git a/ChangeLog b/ChangeLog
index 06871e76a8..c4e97835bc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2007-02-23  Bruno Haible  <bruno@clisp.org>
 
+	Handle better the combination of old Perl and a pre-c99 compiler.
+	* man/Makefile.am (.x.1): If the autoconf test has determined that
+	perl is missing or not a sufficient version, do nothing.
+
 	* tests/readlink/can-e: Put the closing double-quote at the end of a
 	backquoted word, not in the middle. Works around a bug in sh on
 	OSF/1 4.0d.
diff --git a/man/Makefile.am b/man/Makefile.am
index d6a146e631..017c3e2b74 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -1,7 +1,6 @@
 # Make coreutils man pages.				-*-Makefile-*-
 
-# Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software
-# Foundation, Inc.
+# Copyright (C) 2002-2007 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -154,18 +153,23 @@ mapped_name = `echo $*|sed 's/install/ginstall/; s/test/[/'`
 # That is necessary to avoid failures for programs that are also shell built-in
 # functions like echo, false, printf, pwd.
 .x.1:
-	@rm -f $@
-	@echo "Updating man page $@";		\
-	rm -rf $t;				\
-	mkdir $t;				\
-	(cd $t && $(LN_S) ../../src/$(mapped_name) $*); \
-	$(PERL) -- $(srcdir)/help2man		\
-	    --source='$(PACKAGE_STRING)'	\
-	    --include=$(srcdir)/$*.x		\
-	    --output=$t/$@ $t/$*
-	@sed 's|$*\.td/||g' $t/$@ > $@
-	@chmod a-w $@
-	@rm -rf $t
+	@case $(PERL) in					\
+	  *"/missing "*) ;;					\
+	  *)							\
+	    rm -f $@						\
+	    && { echo "Updating man page $@";			\
+	         rm -rf $t;					\
+	         mkdir $t;					\
+	         (cd $t && $(LN_S) ../../src/$(mapped_name) $*); \
+	            $(PERL) -- $(srcdir)/help2man		\
+	             --source='$(PACKAGE_STRING)'		\
+	             --include=$(srcdir)/$*.x			\
+	             --output=$t/$@ $t/$*;			\
+	       }						\
+	    && sed 's|$*\.td/||g' $t/$@ > $@			\
+	    && chmod a-w $@					\
+	    && rm -rf $t ;;					\
+	esac
 
 check-local: check-x-vs-1 check-programs-vs-x