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