summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Meyering <jim@meyering.net>1993-05-02 21:32:34 +0000
committerJim Meyering <jim@meyering.net>1993-05-02 21:32:34 +0000
commitc4117156a444f4b53180874389b71b1900bd1660 (patch)
treeb02f56219b39b2a0635b0a363c042ba74050593c
parent1032082dca7d73491e8f6d72a95eae8d501ba791 (diff)
downloadgnulib-c4117156a444f4b53180874389b71b1900bd1660.tar.gz
GNU file utilitiesFILEUTILS-3_5_2
-rw-r--r--lib/Makefile.in2
-rw-r--r--lib/makepath.c7
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
)