From 26057be2dd3eda9eb907aee3ac833ffc3be26e26 Mon Sep 17 00:00:00 2001
From: Jim Meyering <jim@meyering.net>
Date: Thu, 13 May 1993 01:14:58 +0000
Subject: [PATCH] merge with 3.5.4

---
 lib/Makefile.in | 2 +-
 lib/makepath.c  | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/lib/Makefile.in b/lib/Makefile.in
index 8a4dc8480e..3377776edc 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 123d6abea7..e61579021c 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
 
-- 
2.30.2