merge with 3.5.1

diff --git a/lib/Makefile.in b/lib/Makefile.in
index 83ea2751dcf7f5154a4646f702dd2e821f745217..8a4dc8480e287bb56f833779d58615271f920903 100644 (file)
--- 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 4c19630e661a782ab1f520338e05a4ffee3aefed..123d6abea784f34af18a65c2241d3469af260ea2 100644 (file)
--- 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
                      )