diff options
| author | Bruno Haible <bruno@clisp.org> | 2007-02-24 08:51:19 +0100 |
|---|---|---|
| committer | Jim Meyering <jim@meyering.net> | 2007-02-24 08:51:19 +0100 |
| commit | 63813d09502001302b3da8cb366ad3a4967bafc7 (patch) | |
| tree | 31c1789fa4d20b2d0e365854f92aac2a8c94b4ff | |
| parent | 2e140cfb4236141d18499abedac68d778dcd23e3 (diff) | |
| download | coreutils-63813d09502001302b3da8cb366ad3a4967bafc7.tar.xz | |
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.
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | man/Makefile.am | 32 |
2 files changed, 22 insertions, 14 deletions
@@ -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 d6a146e63..017c3e2b7 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 |