From 1ead947b798b757c98b29ec188872ec0c1fff916 Mon Sep 17 00:00:00 2001
From: Jim Meyering <jim@meyering.net>
Date: Sun, 17 Aug 2003 07:49:10 +0000
Subject: .

---
 ChangeLog                | 1 +
 man/Makefile.in          | 6 ++++--
 src/Makefile.in          | 2 +-
 tests/tail-2/Makefile.in | 5 ++++-
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 747cb8e0a..fe617eeeb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -20,6 +20,7 @@
 	(tail_lines): Likewise, after lseek calls.
 	Reported by Nick Estes.  See http://bugs.debian.org/205251 for details.
 	* tests/tail-2/tail-n0f: New file.  Test for above fix.
+	* tests/tail-2/Makefile.am (TESTS): Add tail-n0f.
 
 2003-08-15  Jim Meyering  <jim@meyering.net>
 
diff --git a/man/Makefile.in b/man/Makefile.in
index ef1d2dd64..552e615ab 100644
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -481,13 +481,15 @@ yes.1:		$(common_dep)	$(srcdir)/yes.x		../src/yes.c
 # 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 $@";		\
 	mkdir $t;				\
 	(cd $t && $(LN_S) ../../src/$(mapped_name)$(EXEEXT) $*$(EXEEXT)); \
 	$(HELP2MAN)				\
 	    --include=$(srcdir)/$*.x		\
-	    --output=$@ $t/$*$(EXEEXT);		\
-	rm -rf $t
+	    --output=$@ $t/$*$(EXEEXT)
+	@chmod a-w $@
+	@rm -rf $t
 
 check-local: check-x-vs-1 check-programs-vs-x
 
diff --git a/src/Makefile.in b/src/Makefile.in
index 72979b9db..3db6e2076 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -873,7 +873,7 @@ uninstall-binPROGRAMS:
 	done
 
 clean-binPROGRAMS:
-	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
+	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) > /dev/null 2>&1 || /bin/rm -f $(bin_PROGRAMS)
 
 installcheck-binPROGRAMS: $(bin_PROGRAMS)
 	bad=0; pid=$$$$; list="$(bin_PROGRAMS)"; for p in $$list; do \
diff --git a/tests/tail-2/Makefile.in b/tests/tail-2/Makefile.in
index a9a46cfa5..58750530c 100644
--- a/tests/tail-2/Makefile.in
+++ b/tests/tail-2/Makefile.in
@@ -162,7 +162,10 @@ TESTS_ENVIRONMENT = \
   PROG=tail
 
 
-TESTS = big-4gb proc-ksyms start-middle assert assert-2
+TESTS = \
+  tail-n0f \
+  big-4gb proc-ksyms start-middle assert assert-2
+
 subdir = tests/tail-2
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
-- 
cgit v1.2.3-54-g00ecf