.

diff --git a/aclocal.m4 b/aclocal.m4
index d4d5513d35774a102d561aac078f2a1d8fac5ed5..1aef9b46268f37b66b821bcd8ec3e66595a1d401 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -3698,7 +3698,7 @@ AC_DEFUN([UTILS_SYS_OPEN_MAX],
     [the maximum number of simultaneously open files per process])
 ])
 
-#serial 3
+#serial 4
 # Check whether getcwd has the bug that it succeeds for a working directory
 # longer than PATH_MAX, yet returns a truncated directory name.
 # If so, arrange to compile the wrapper function.
@@ -3711,10 +3711,10 @@ AC_DEFUN([UTILS_SYS_OPEN_MAX],
 
 AC_DEFUN([GL_FUNC_GETCWD_PATH_MAX],
 [
+  AC_CHECK_DECLS([getcwd])
   AC_CACHE_CHECK([whether getcwd properly handles paths longer than PATH_MAX],
                  gl_cv_func_getcwd_vs_path_max,
   [
-  AC_CHECK_DECLS([getcwd])
   # Arrange for deletion of the temporary directory this test creates.
   ac_clean_files="$ac_clean_files confdir3"
   AC_RUN_IFELSE([AC_LANG_SOURCE([[

diff --git a/src/Makefile.in b/src/Makefile.in
index d8fd6762dd9c1a5335409c2ae4ae5b19c38d0988..5133ceab5fcbdab3b47a03df3c405837648f4bee 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -843,7 +843,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/uniq/Makefile.in b/tests/uniq/Makefile.in
index 58beb352db9802b06033c483301f0b8edca76d00..6ec40c78af776566690c8bef4ca25421c157a80e 100644 (file)
--- a/tests/uniq/Makefile.in
+++ b/tests/uniq/Makefile.in
@@ -159,7 +159,7 @@ obs45.X 50.I 50.X 51.I 51.X 52.I 52.X 53.I 53.X 54.I 54.X 55.I 55.X 56.I 56.X \
 57.I 57.X 60.I 60.X 61.I 61.X 62.I 62.X 63.I 63.X 64.I 64.X 65.I 65.X 90.I \
 90.X 91.I 91.X 92.I 92.X 93.I 93.X 94.I 94.X 101.I 101.X 102.I 102.X 110.I \
 110.X 111.I 111.X 112.I 112.X 113.I 113.X 114.I 114.X 115.I 115.X 116.I 116.X \
-117.I 117.X 118.I 118.X 119.I 119.X
+117.I 117.X 118.I 118.X 119.I 119.X 120.I 120.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 10.O 10.E 11.O 11.E 12.O 12.E 13.O 13.E 20.O 20.E 21.O 21.E 22.O 22.E \
@@ -169,13 +169,13 @@ obs45.E 50.O 50.E 51.O 51.E 52.O 52.E 53.O 53.E 54.O 54.E 55.O 55.E 56.O 56.E \
 57.O 57.E 60.O 60.E 61.O 61.E 62.O 62.E 63.O 63.E 64.O 64.E 65.O 65.E 90.O \
 90.E 91.O 91.E 92.O 92.E 93.O 93.E 94.O 94.E 101.O 101.E 102.O 102.E 110.O \
 110.E 111.O 111.E 112.O 112.E 113.O 113.E 114.O 114.E 115.O 115.E 116.O 116.E \
-117.O 117.E 118.O 118.E 119.O 119.E
+117.O 117.E 118.O 118.E 119.O 119.E 120.O 120.E
 
 
 EXTRA_DIST = Test.pm $x-tests $(explicit) $(maint_gen)
 noinst_SCRIPTS = $x-tests
 
-editpl = sed -e 's,@''PERL''@,$(PERL),g' -e 's,@''srcdir''@,@srcdir@,g'
+editpl = sed -e 's,@''PERL''@,$(PERL),g' -e 's,@''srcdir''@,$(srcdir),g'
 
 TESTS = $x-tests