From c265d0a1c89653d1cd0f0fbef3cfdea8a84d3fa8 Mon Sep 17 00:00:00 2001
From: Jim Meyering <jim@meyering.net>
Date: Sun, 2 May 1993 21:36:04 +0000
Subject: [PATCH] merge with 3.5.1

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

diff --git a/lib/Makefile.in b/lib/Makefile.in
index 83ea2751dc..8a4dc8480e 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -43,7 +43,7 @@ fnmatch.h fsusage.h mountlist.h pathmax.h system.h $(SOURCES)
 all: libfu.a
 
 .c.o:
-	$(CC) -c $(CFLAGS) $(CPPFLAGS) $(DEFS) -I$(srcdir) $<
+	$(CC) -c $(DEFS) -I$(srcdir) $(CPPFLAGS) $(CFLAGS) $<
 
 install: all
 
diff --git a/lib/makepath.c b/lib/makepath.c
index 4c19630e66..123d6abea7 100644
--- a/lib/makepath.c
+++ b/lib/makepath.c
@@ -43,8 +43,11 @@ char *alloca ();
 #endif
 
 #ifdef STDC_HEADERS
-#include <errno.h>
 #include <stdlib.h>
+#endif
+
+#if defined (STDC_HEADERS) || defined (HAVE_ERRNO_H)
+#include <errno.h>
 #else
 extern int errno;
 #endif
@@ -147,7 +150,7 @@ make_path (argpath, mode, parent_mode, owner, group, verbose_fmt_string)
 
 		  if (owner != (uid_t) -1 && group != (gid_t) -1
 		      && chown (dirpath, owner, group)
-#ifdef AFS
+#if defined(AFS) && defined (EPERM)
 		      && errno != EPERM
 #endif
 		      )
-- 
2.30.2