From: Jim Meyering Date: Tue, 22 Jul 2003 16:32:33 +0000 (+0000) Subject: (.x.1): Substitute 's,$t/$*,$*,' on output of X-Git-Tag: v5.0.90~149 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1277d8b91c6c41283562865c1c0fc925a2e58280;p=thirdparty%2Fcoreutils.git (.x.1): Substitute 's,$t/$*,$*,' on output of help2man, to avoid having `rm.td/rm' appear in rm.1. Reported by Thomas Luzat. See http://bugs.debian.org/202413 for details. --- diff --git a/man/Makefile.am b/man/Makefile.am index e241a061d8..91445ab2d8 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -123,13 +123,18 @@ mapped_name = `echo $*|sed 's/install/ginstall/'` # Note the use of $t/$*, rather than just `$*' as in other packages. # That is necessary to avoid failures for programs that are also shell built-in # functions like echo, false, printf, pwd. +# The shenanigans after invoking $(HELP2MAN) are solely to convert the +# two uses of program_name in rm.1's examples with `rm'. +# Otherwise, they would otherwise appear as `rm.td/rm'. .x.1: @echo "Updating man page $@"; \ mkdir $t; \ (cd $t && $(LN_S) ../../src/$(mapped_name)$(EXEEXT) $*$(EXEEXT)); \ $(HELP2MAN) \ --include=$(srcdir)/$*.x \ - --output=$@ $t/$*$(EXEEXT); \ + --output=$@t $t/$*$(EXEEXT) + sed 's,$t/$*,$*,' $@t > $@t2 + mv $@t2 $@ rm -rf $t check-local: check-x-vs-1 check-programs-vs-x