merge with 3.5.4

diff --git a/lib/Makefile.in b/lib/Makefile.in
index 8a4dc8480e287bb56f833779d58615271f920903..3377776edcd3020ff3f8d03bcd0ce837d7387e6e 100644 (file)
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -66,7 +66,7 @@ realclean: distclean
 dist:
        for file in $(DISTFILES); do \
          ln $$file ../`cat ../.fname`/lib \
-           || cp $$file ../`cat ../.fname`/lib; \
+           || cp -p $$file ../`cat ../.fname`/lib; \
        done
 
 libfu.a: $(OBJECTS)

diff --git a/lib/makepath.c b/lib/makepath.c
index 123d6abea784f34af18a65c2241d3469af260ea2..e61579021c204d7a613dae11b92091610003131c 100644 (file)
--- a/lib/makepath.c
+++ b/lib/makepath.c
@@ -46,9 +46,11 @@ char *alloca ();
 #include <stdlib.h>
 #endif
 
-#if defined (STDC_HEADERS) || defined (HAVE_ERRNO_H)
+#ifdef HAVE_ERRNO_H
 #include <errno.h>
-#else
+#endif
+
+#ifndef STDC_HEADERS
 extern int errno;
 #endif
 

diff --git a/old/fileutils/ChangeLog b/old/fileutils/ChangeLog
index 18ca010d773ce5f8aaf87aec0a4d74fae342fef8..210d5e160dff74c06578dcef90e97e46044ede40 100644 (file)
--- a/old/fileutils/ChangeLog
+++ b/old/fileutils/ChangeLog
@@ -1,3 +1,21 @@
+Wed May 12 20:48:55 1993  Jim Meyering (meyering@comco.com)
+
+       * configure.in: Add check for the -ldgc library that is required
+       for getmntent on m88k DGUX-5.4 systems.
+
+Sat May  8 11:31:14 1993  Jim Meyering (meyering@comco.com)
+
+       * lib/Makefile.in (dist): Use `cp -p' instead of just `cp'
+       if linking fails.
+
+Thu May  6 22:45:25 1993  Jim Meyering (meyering@comco.com)
+
+       * makepath.c: Use explicit dcl of errno only if !STDC_HEADERS.
+       Some systems have <errno.h> but don't declare errno.
+       From Kaveh R. Ghazi <ghazi@caip.rutgers.edu>.
+
+       * getdate.y: Test TIME_WITH_SYS_TIME, not TIME_AND_SYS_TIME.
+
 Wed May  5 00:21:12 1993  Jim Meyering (meyering@comco.com)
 
        * configure.in: Add AC_TIME_WITH_SYS_TIME.