From: Jim Meyering <jim@meyering.net>
Date: Sat, 26 Jul 2003 09:02:33 +0000 (+0000)
Subject: .
X-Git-Tag: v5.0.90~66
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a207cf0b03c537bee195cd70f5dc28ccd8f2ab6e;p=thirdparty%2Fcoreutils.git

.
---

diff --git a/man/Makefile.in b/man/Makefile.in
index 513c5c8fa6..60482b16a9 100644
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -176,8 +176,9 @@ SUFFIXES = .x .1
 
 # Ensure that help2man runs the ../src/ginstall binary as
 # `install' when creating install.1.
+# Similarly, ensure that it uses the ../src/[ binary to create test.1.
 t = $*.td
-mapped_name = `echo $*|sed 's/install/ginstall/'`
+mapped_name = `echo $*|sed 's/install/ginstall/; s/test/[/'`
 
 programs = \
   echo 'spy:;@echo $$(all_programs)'					\
@@ -473,18 +474,13 @@ yes.1:		$(common_dep)	$(srcdir)/yes.x		../src/yes.c
 # 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 $t/$*$(EXEEXT)
-	sed 's,$t/$*,$*,' $@t > $@t2
-	mv $@t2 $@
+	    --output=$@ $t/$*$(EXEEXT);		\
 	rm -rf $t
 
 check-local: check-x-vs-1 check-programs-vs-x