Don't use "path" or "filename" to mean "file name".

diff --git a/m4/ChangeLog b/m4/ChangeLog
index d7b22f3..79f89c2 100644 (file)
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,3 +1,17 @@
+2005-06-01  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * mkdir-p.m4: Renamed from makepath.m4.
+       (gl_MKDIR_PARENTS): Renamed from gl_MAKEPATH.  All uses changed.
+       Rename files from makepath.c to mkdir-p.c, and from
+       makepath.h to mkdir-p.h.
+       * filenamecat.m4: Renamed from path-concat.m4.
+       (gl_FILE_NAME_CONCAT): Renamed from gl_PATH_CONCAT.  All uses changed.
+       Rename files from path-concat.c to filenamecat.c,
+       and from path-concat.h to filenamecat.h.
+       * getcwd-path-max.m4: Don't use "path" or "filename" to mean
+       "file name" in local variables or comments.
+       * rename.m4: Likewise.
+
 2005-05-30  Paul Eggert  <eggert@cs.ucla.edu>
 
        * jm-macros.m4 (gl_CHECK_ALL_HEADERS): Check for priv.h.

diff --git a/m4/getcwd-path-max.m4 b/m4/getcwd-path-max.m4
index d632c42..74570df 100644 (file)
--- a/m4/getcwd-path-max.m4
+++ b/m4/getcwd-path-max.m4
@@ -1,5 +1,5 @@
-#serial 8
-# Check for several getcwd bugs with long paths.
+#serial 9
+# Check for several getcwd bugs with long file names.
 # If so, arrange to compile the wrapper function.
 
 # This is necessary for at least GNU libc on linux-2.4.19 and 2.4.20.

diff --git a/m4/prereq.m4 b/m4/prereq.m4
index 7e73337..b6c74ca 100644 (file)
--- a/m4/prereq.m4
+++ b/m4/prereq.m4
@@ -1,4 +1,4 @@
-#serial 56
+#serial 57
 
 dnl We use gl_ for non Autoconf macros.
 m4_pattern_forbid([^gl_[ABCDEFGHIJKLMNOPQRSTUVXYZ]])dnl
@@ -48,6 +48,7 @@ AC_DEFUN([gl_PREREQ],
   AC_REQUIRE([gl_EXITFAIL])
   AC_REQUIRE([gl_FILEBLOCKS])
   AC_REQUIRE([gl_FILEMODE])
+  AC_REQUIRE([gl_FILE_NAME_CONCAT])
   AC_REQUIRE([gl_FILE_TYPE])
   AC_REQUIRE([gl_FSUSAGE])
   AC_REQUIRE([gl_FUNC_ALLOCA])
@@ -104,15 +105,14 @@ AC_DEFUN([gl_PREREQ],
   AC_REQUIRE([gl_LINEBUFFER])
   AC_REQUIRE([gl_LOCALCHARSET])
   AC_REQUIRE([gl_LONG_OPTIONS])
-  AC_REQUIRE([gl_MAKEPATH])
   AC_REQUIRE([gl_MBSWIDTH])
   AC_REQUIRE([gl_MD5])
   AC_REQUIRE([gl_MEMCOLL])
+  AC_REQUIRE([gl_MKDIR_PARENTS])
   AC_REQUIRE([gl_MODECHANGE])
   AC_REQUIRE([gl_MOUNTLIST])
   AC_REQUIRE([gl_OBSTACK])
   AC_REQUIRE([gl_PATHMAX])
-  AC_REQUIRE([gl_PATH_CONCAT])
   AC_REQUIRE([gl_PHYSMEM])
   AC_REQUIRE([gl_POSIXTM])
   AC_REQUIRE([gl_POSIXVER])

diff --git a/m4/rename.m4 b/m4/rename.m4
index 7d59160..1c9e0e9 100644 (file)
--- a/m4/rename.m4
+++ b/m4/rename.m4
@@ -1,12 +1,12 @@
-#serial 7
+#serial 8
 
-# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
 dnl From Volker Borchert.
-dnl Determine whether rename works for source paths with a trailing slash.
+dnl Determine whether rename works for source file names with a trailing slash.
 dnl The rename from SunOS 4.1.1_U1 doesn't.
 dnl
 dnl If it doesn't, then define RENAME_TRAILING_SLASH_BUG and arrange
@@ -41,8 +41,8 @@ AC_DEFUN([vb_FUNC_RENAME],
     AC_DEFINE(rename, rpl_rename,
       [Define to rpl_rename if the replacement function should be used.])
     AC_DEFINE(RENAME_TRAILING_SLASH_BUG, 1,
-      [Define if rename does not work for source paths with a trailing slash,
-       like the one from SunOS 4.1.1_U1.])
+      [Define if rename does not work for source file names with a trailing
+       slash, like the one from SunOS 4.1.1_U1.])
     gl_PREREQ_RENAME
   fi
 ])