summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Youngman <jay@gnu.org>2008-02-13 23:52:04 +0000
committerJames Youngman <jay@gnu.org>2008-02-13 23:52:04 +0000
commitb99109f9210d17301555d863d98ddbb60cb034ae (patch)
tree2721035409a4703cf62c9803600992d33516fe7c
parent96326252f957fc81251ac81ade88fbfd0446b86c (diff)
downloadfindutils-b99109f9210d17301555d863d98ddbb60cb034ae.tar.gz
Applied tiny change from Ralf Wildenhues and updated the gnulib version
-rw-r--r--ChangeLog10
-rw-r--r--import-gnulib.config5
-rw-r--r--lib/Makefile.am2
-rw-r--r--xargs/xargs.12
4 files changed, 13 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index bfb6bbb9..dde879dc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-02-13 Ralf Wildenhues <Ralf.Wildenhues@gmx.de> (tiny change)
+
+ * import-gnulib.config: Add progname.
+
+ * lib/Makefile.am (LDADD): Use @LIBINTL@ instead of @INTLLIBS@.
+
+ * xargs/xargs.1: Fix a couple of typos.
+
2008-02-12 James Youngman <jay@gnu.org>
Updated translations: German, Irish, Dutch, Polish, Vietnamese.
@@ -2220,7 +2228,7 @@
* find/testsuite/find.posix/perm-X.exp: New file.
* find/testsuite/find.posix/perm-X.so: New file.
-12006-08-19 Paul Eggert <eggert@cs.ucla.edu>
+2006-08-19 Paul Eggert <eggert@cs.ucla.edu>
Port to latest gnulib, and simplify the bootstrapping procedure.
* intl: Remove this directory and everything in it.
diff --git a/import-gnulib.config b/import-gnulib.config
index 626a90f1..f2e89983 100644
--- a/import-gnulib.config
+++ b/import-gnulib.config
@@ -1,9 +1,7 @@
# findutils gnulib.config -*- sh -*-
# What version of gnulib to use?
-#gnulib_version="a1d5bf4615a98dd53267bf49646a09b823df3fe2"
-gnulib_version="0ecab77568dafa1f0b67627f319efe88d51d3b86"
-
+gnulib_version="e5573b1bad88bfabcda181b9e0125fb0c52b7d3b"
destdir="gnulib"
# Random extra gnulib files needed for findutils.
@@ -64,6 +62,7 @@ mktime
modechange
mountlist
pathmax
+progname
quotearg
realloc
regex
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 56b8b498..8f8319a5 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -25,7 +25,7 @@ MAINTAINERCLEANFILES =
INCLUDES = -I../gnulib/lib -I$(top_srcdir)/gnulib/lib
-LDADD = ../gnulib/lib/libgnulib.a @INTLLIBS@
+LDADD = ../gnulib/lib/libgnulib.a @LIBINTL@
libfind_a_SOURCES += modetype.h nextelem.h printquoted.h listfile.h \
regextype.h dircallback.h
diff --git a/xargs/xargs.1 b/xargs/xargs.1
index 6910f465..413b55ec 100644
--- a/xargs/xargs.1
+++ b/xargs/xargs.1
@@ -353,7 +353,7 @@ Generates a compact listing of all the users on the system.
.B xargs sh -c 'emacs \(dq$@\(dq < /dev/tty' emacs
.fi
-Launches the minumum number of copes of Emacs needed, one after the
+Launches the minimum number of copies of Emacs needed, one after the
other, to edit the files listed on
.BR xargs '
standard input. This example achieves the same effect as BSD's