diff options
| -rw-r--r-- | aclocal.m4 | 8 | ||||
| -rw-r--r-- | man/Makefile.in | 7 | ||||
| -rw-r--r-- | src/Makefile.in | 2 | ||||
| -rw-r--r-- | tests/cut/Makefile.in | 10 | ||||
| -rw-r--r-- | tests/rm/Makefile.in | 1 |
5 files changed, 18 insertions, 10 deletions
diff --git a/aclocal.m4 b/aclocal.m4 index 188d0a369..08c1a80d7 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1352,7 +1352,7 @@ AC_DEFUN([jm_INCLUDED_REGEX], # Prerequisites of lib/regex.c. AC_DEFUN([jm_PREREQ_REGEX], [ - dnl FIXME: Maybe provide a btowc replacement someday: solaris-2.5.1 lacks it. + dnl FIXME: Maybe provide a btowc replacement someday: Solaris 2.5.1 lacks it. dnl FIXME: Check for wctype and iswctype, and and add -lw if necessary dnl to get them. @@ -2831,7 +2831,7 @@ main () dnl From Jim Meyering. dnl Determine whether lstat has the bug that it succeeds when given the -dnl zero-length file name argument. The lstat from SunOS4.1.4 and the Hurd +dnl zero-length file name argument. The lstat from SunOS 4.1.4 and the Hurd dnl (as of 1998-11-01) do this. dnl dnl If it does, then define HAVE_LSTAT_EMPTY_STRING_BUG and arrange to @@ -3200,7 +3200,7 @@ AC_DEFUN([gl_PREREQ_MKTIME], [ dnl From Jim Meyering. dnl Determine whether stat has the bug that it succeeds when given the -dnl zero-length file name argument. The stat from SunOS4.1.4 and the Hurd +dnl zero-length file name argument. The stat from SunOS 4.1.4 and the Hurd dnl (as of 1998-11-01) do this. dnl dnl If it does, then define HAVE_STAT_EMPTY_STRING_BUG and arrange to @@ -3968,7 +3968,7 @@ AC_DEFUN([vb_FUNC_RENAME], #serial 1 -# On some systems (e.g., HPUX-10.20, SunOS4.1.4, solaris2.5.1), mkstemp has the +# On some hosts (e.g., HP-UX 10.20, SunOS 4.1.4, Solaris 2.5.1), mkstemp has a # silly limit that it can create no more than 26 files from a given template. # Other systems lack mkstemp altogether. On either type of system, arrange # to use the replacement function. diff --git a/man/Makefile.in b/man/Makefile.in index e24d41aab..513c5c8fa 100644 --- a/man/Makefile.in +++ b/man/Makefile.in @@ -473,13 +473,18 @@ 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/$*$(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 diff --git a/src/Makefile.in b/src/Makefile.in index b79377393..565a9389b 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -866,7 +866,7 @@ uninstall-binPROGRAMS: done clean-binPROGRAMS: - -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) > /dev/null 2>&1 || /bin/rm -f $(bin_PROGRAMS) + -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) installcheck-binPROGRAMS: $(bin_PROGRAMS) bad=0; pid=$$$$; list="$(bin_PROGRAMS)"; for p in $$list; do \ diff --git a/tests/cut/Makefile.in b/tests/cut/Makefile.in index 417abe873..ad6df72c2 100644 --- a/tests/cut/Makefile.in +++ b/tests/cut/Makefile.in @@ -161,8 +161,9 @@ empty-fl.X missing-fl.I missing-fl.X empty-bl.I empty-bl.X missing-bl.I \ missing-bl.X empty-f1.I empty-f1.X empty-f2.I empty-f2.X o-delim.I o-delim.X \ nul-idelim.I nul-idelim.X nul-odelim.I nul-odelim.X multichar-od.I \ multichar-od.X 8bit-delim.I 8bit-delim.X out-delim1.I out-delim1.X \ -out-delim2.I out-delim2.X out-delim3.I out-delim3.X out-delim4.I out-delim4.X \ -out-delim5.I out-delim5.X +out-delim2.I out-delim2.X out-delim3.I out-delim3.X out-delim3a.I \ +out-delim3a.X out-delim4.I out-delim4.X out-delim5.I out-delim5.X \ +out-delim6.I out-delim6.X run_gen = 1.O 1.E 2.O 2.E 3.O 3.E 4.O 4.E 5.O 5.E 6.O 6.E 7.O 7.E 8.O 8.E 9.O \ 9.E a.O a.E b.O b.E c.O c.E d.O d.E e.O e.E f.O f.E g.O g.E h.O h.E i.O i.E \ @@ -172,8 +173,9 @@ empty-fl.E missing-fl.O missing-fl.E empty-bl.O empty-bl.E missing-bl.O \ missing-bl.E empty-f1.O empty-f1.E empty-f2.O empty-f2.E o-delim.O o-delim.E \ nul-idelim.O nul-idelim.E nul-odelim.O nul-odelim.E multichar-od.O \ multichar-od.E 8bit-delim.O 8bit-delim.E out-delim1.O out-delim1.E \ -out-delim2.O out-delim2.E out-delim3.O out-delim3.E out-delim4.O out-delim4.E \ -out-delim5.O out-delim5.E +out-delim2.O out-delim2.E out-delim3.O out-delim3.E out-delim3a.O \ +out-delim3a.E out-delim4.O out-delim4.E out-delim5.O out-delim5.E \ +out-delim6.O out-delim6.E EXTRA_DIST = Test.pm $x-tests $(explicit) $(maint_gen) diff --git a/tests/rm/Makefile.in b/tests/rm/Makefile.in index 1d0fcaca2..2f0c25a02 100644 --- a/tests/rm/Makefile.in +++ b/tests/rm/Makefile.in @@ -167,6 +167,7 @@ TESTS_ENVIRONMENT = \ srcdir=$(srcdir) \ PERL="$(PERL)" \ PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH" \ + PACKAGE_VERSION=$(PACKAGE_VERSION) \ PROG=rm subdir = tests/rm |