* src/rm.c: Include "dirname.h".

	(usage): Use base_name (program_name) in body of --help output.
	This lets me...
	* man/Makefile.am (.x.1): ...back out the kludge of 2003-07-22.

diff --git a/man/Makefile.am b/man/Makefile.am
index b0e397bdde6ee927065b1bdac68c7f2dba88c625..f40cb3640c743eb16e1ad96163089a09611a5598 100644 (file)
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -124,18 +124,13 @@ mapped_name = `echo $*|sed 's/install/ginstall/; s/test/[/'`
 # 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