summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorJim Meyering <jim@meyering.net>1993-05-13 01:14:47 +0000
committerJim Meyering <jim@meyering.net>1993-05-13 01:14:47 +0000
commit5ca6750d57a9d89163cd3548758589d4ab14c75c (patch)
tree334b725d51c4b0772bf0fc9339c658e208c4e356 /lib
parent9a96f7c461a5c7c53639d3f84bd446a6959aa1a9 (diff)
downloadcoreutils-5ca6750d57a9d89163cd3548758589d4ab14c75c.tar.xz
merge with 3.5.4
Diffstat (limited to 'lib')
-rw-r--r--lib/Makefile.in2
-rw-r--r--lib/makepath.c6
2 files changed, 5 insertions, 3 deletions
diff --git a/lib/Makefile.in b/lib/Makefile.in
index 8a4dc8480..3377776ed 100644
--- 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 123d6abea..e61579021 100644
--- 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