New file to override autoconf's AC_SEARCH_LIBS.

[gnulib.git] / lib / makepath.c

diff --git a/lib/makepath.c b/lib/makepath.c
index bf6ba31..20e9a12 100644 (file)
--- a/lib/makepath.c
+++ b/lib/makepath.c
@@ -96,6 +96,9 @@ extern int errno;
 
 #define WX_USR (S_IWUSR | S_IXUSR)
 
+/* Include this before libintl.h so we get our definition of PARAMS. */
+#include "makepath.h"
+
 #if HAVE_LOCALE_H
 # include <locale.h>
 #endif
@@ -113,7 +116,6 @@ typedef int gid_t;
 #endif
 
 #include "save-cwd.h"
-#include "makepath.h"
 #include "error.h"
 
 void strip_trailing_slashes ();
@@ -160,6 +162,7 @@ make_dir (const char *dir, const char *dirpath, mode_t mode, int *created_dir_p)
   if (!created_dir)
     {
       struct stat stats;
+      int saved_errno = errno;
 
       /* The mkdir and stat calls below may appear to be reversed.
         They are not.  It is important to call mkdir first and then to
@@ -171,7 +174,7 @@ make_dir (const char *dir, const char *dirpath, mode_t mode, int *created_dir_p)
 
       if (stat (dir, &stats))
        {
-         error (0, errno, _("cannot create directory `%s'"), dirpath);
+         error (0, saved_errno, _("cannot create directory `%s'"), dirpath);
          fail = 1;
        }
       else if (!S_ISDIR (stats.st_mode))