summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog22
-rw-r--r--Makefile.am5
-rw-r--r--NEWS3
-rw-r--r--build-aux/.cvsignore1
-rwxr-xr-xbuild-aux/man-lint.sh19
-rw-r--r--find/Makefile.am4
-rw-r--r--find/find.14
-rwxr-xr-ximport-gnulib.sh3
-rw-r--r--locate/Makefile.am5
-rw-r--r--xargs/Makefile.am4
10 files changed, 65 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 4e786c0e..2d482b23 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,25 @@
+2007-05-19 James Youngman <jay@gnu.org>
+
+ * find/find.1: Spurious .R directives (.R is not a directive)
+ should be .B. This fixes Savannah bug #19871.
+ * build-aux/man-lint.sh: New file; verifies that the specified
+ manual pages do not provoke error messages from troff. This is
+ used to detect further occurrences of Savannah bug #19871.
+ * find/Makefile.am (dist-hook): Run findutils-check-manpages,
+ which invokes man-lint.sh.
+ * locate/Makefile.am (dist-hook): ditto
+ * xargs/Makefile.am (dist-hook): ditto
+
+ * .cvsignore: Ignore ylwrap, which automake-1.10 wants us to have
+ a copy of for some reason
+
+ * import-gnulib.sh (main): New option -a which just runs the
+ autotools without reimporting gnulib.
+
+ * Makefile.am (jy-regex-fix): The previous explanatory comment
+ refers to the jy-regex-fix target, not to dist-hook, so it has
+ been moved.
+
2007-05-08 James Youngman <jay@gnu.org>
* find/defs.h (struct predicate.args): str is now const.
diff --git a/Makefile.am b/Makefile.am
index 3ed8700b..0f5bf88d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,6 +15,9 @@ TESTFILE_SUFFIXES = .exp .xo .xe .xi
# DISTCLEANFILES = intl/libintl.h
+dist-hook: jy-regex-fix findutils-check-pofiles findutils-check-testfiles
+
+
##
## regex.c seems to get left out if I use automake-1.9 but not
## if I use automake-1.7. Hence dist-hook has to be able to
@@ -23,8 +26,6 @@ TESTFILE_SUFFIXES = .exp .xo .xe .xi
## file is already in place. Ugh.
## -- James Youngman <jay@gnu.org>
##
-dist-hook: jy-regex-fix findutils-check-pofiles findutils-check-testfiles
-
jy-regex-fix:
if test -f $(distdir)/gnulib/lib/regex.c ; then \
echo regex.c is already in place. Great. ; \
diff --git a/NEWS b/NEWS
index 45f7b603..d778fc8a 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,9 @@ GNU findutils NEWS - User visible changes. -*- outline -*- (allout)
** Bug Fixes
+#19871: Spurious .R directives in manpage produced error messages from
+GNU troff. This is now fixed (they are corrected to .B).
+
#19416: The result of I/O operations in print-related actions is now
checked, and failures are reported. Any failure will cause find's
exit status to be nonzero. The predicate itself will continue to
diff --git a/build-aux/.cvsignore b/build-aux/.cvsignore
index 27caf03f..6093b00b 100644
--- a/build-aux/.cvsignore
+++ b/build-aux/.cvsignore
@@ -8,3 +8,4 @@ missing
texinfo.tex
link-warning.h
Makefile.in mkinstalldirs
+ylwrap
diff --git a/build-aux/man-lint.sh b/build-aux/man-lint.sh
new file mode 100755
index 00000000..813df1ba
--- /dev/null
+++ b/build-aux/man-lint.sh
@@ -0,0 +1,19 @@
+#! /bin/sh
+
+rv=0
+srcdir="$1" ; shift
+
+for manpage
+do
+ what="lint check on manpage $manpage"
+ echo -n "$what: "
+ messages="$( troff -t -man ${srcdir}/${manpage} 2>&1 >/dev/null )"
+ if test -z "$messages" ; then
+ echo "passed"
+ else
+ echo "FAILED:" >&2
+ echo "$messages" >&2
+ rv=1
+ fi
+done
+exit $rv
diff --git a/find/Makefile.am b/find/Makefile.am
index 143afa73..01a1dc48 100644
--- a/find/Makefile.am
+++ b/find/Makefile.am
@@ -32,3 +32,7 @@ SUBDIRS = testsuite
#$(PROGRAMS): ../lib/libfind.a
+dist-hook: findutils-check-manpages
+
+findutils-check-manpages:
+ $(top_srcdir)/build-aux/man-lint.sh $(srcdir) $(man_MANS)
diff --git a/find/find.1 b/find/find.1
index 20ce1b7e..90e47105 100644
--- a/find/find.1
+++ b/find/find.1
@@ -314,9 +314,9 @@ reference file specified on the command line. When these tests are
used, the interpretation of the reference file is determined by the
options
.BR \-H ,
-.R \-L
+.B \-L
and
-.R -P
+.B -P
and any previous
.BR \-follow ,
but the reference file is only examined once, at the time the command
diff --git a/import-gnulib.sh b/import-gnulib.sh
index 39cf598f..3872f031 100755
--- a/import-gnulib.sh
+++ b/import-gnulib.sh
@@ -210,10 +210,11 @@ EOF
main() {
## Option parsing
local gnulibdir=/doesnotexist
- while getopts "d:" opt
+ while getopts "d:a" opt
do
case "$opt" in
d) gnulibdir="$OPTARG" ; need_checkout=no ;;
+ a) refresh_output_files ; exit $? ;;
**) usage; exit 1;;
esac
done
diff --git a/locate/Makefile.am b/locate/Makefile.am
index 5a5db770..edd9bfa9 100644
--- a/locate/Makefile.am
+++ b/locate/Makefile.am
@@ -45,3 +45,8 @@ dblocation.texi: Makefile
echo '@set LOCATE_DB $(LOCATE_DB)' > $@
SUBDIRS = testsuite
+
+dist-hook: findutils-check-manpages
+
+findutils-check-manpages:
+ $(top_srcdir)/build-aux/man-lint.sh $(srcdir) $(man_MANS)
diff --git a/xargs/Makefile.am b/xargs/Makefile.am
index 29c7eddc..1832aa51 100644
--- a/xargs/Makefile.am
+++ b/xargs/Makefile.am
@@ -9,3 +9,7 @@ SUBDIRS = testsuite
$(PROGRAMS): ../find/version.o ../lib/libfind.a ../gnulib/lib/libgnulib.a
+dist-hook: findutils-check-manpages
+
+findutils-check-manpages:
+ $(top_srcdir)/build-aux/man-lint.sh $(srcdir) $(man_MANS)