[Emacs-diffs] /srv/bzr/emacs/trunk r108327: Use full name for m4/gnulib-comp.m4. (Bug#11529)

[Paul Eggert]

------------------------------------------------------------
revno: 108327
fixes bug(s): http://debbugs.gnu.org/11529
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Mon 2012-05-21 12:04:11 -0700
message:
  Use full name for m4/gnulib-comp.m4.  (Bug#11529)
  
  Previously the file was named m4/gl-comp.m4 due to DOS 8+3 restrictions,
  even though the file's name in gnulib is m4/gnulib-comp.m4.
  This had a problem when merging from gnulib, as the code temporarily
  renamed it to the full name, causing problems when interrupted.
  Now the file has its full name, with the idea that we will find
  a solution for MS-DOS that does not affect the rest of Emacs.
  * m4/gnulib-comp.m4: Rename from m4/gl-comp.m4.
  * admin/merge-gnulib: Leave m4/gnulib-comp.m4's name alone.
renamed:
  m4/gl-comp.m4 => m4/gnulib-comp.m4
modified:
  ChangeLog
  admin/ChangeLog
  admin/merge-gnulib

=== modified file 'ChangeLog'
--- a/ChangeLog 2012-05-21 15:36:54 +0000
+++ b/ChangeLog 2012-05-21 19:04:11 +0000
@@ -1,5 +1,14 @@
 2012-05-21  Paul Eggert  <address@hidden>
 
+       Use full name for m4/gnulib-comp.m4.  (Bug#11529)
+       Previously the file was named m4/gl-comp.m4 due to DOS 8+3 restrictions,
+       even though the file's name in gnulib is m4/gnulib-comp.m4.
+       This had a problem when merging from gnulib, as the code temporarily
+       renamed it to the full name, causing problems when interrupted.
+       Now the file has its full name, with the idea that we will find
+       a solution for MS-DOS that does not affect the rest of Emacs.
+       * m4/gnulib-comp.m4: Rename from m4/gl-comp.m4.
+
        Assume C89 or later.
        * configure.in (AC_C_PROTOTYPES, AC_C_VOLATILE, AC_C_CONST)
        (POINTER_TYPE, PROTOTYPES): Remove.

=== modified file 'admin/ChangeLog'
--- a/admin/ChangeLog   2012-05-21 15:36:54 +0000
+++ b/admin/ChangeLog   2012-05-21 19:04:11 +0000
@@ -1,5 +1,8 @@
 2012-05-21  Paul Eggert  <address@hidden>
 
+       Use full name for m4/gnulib-comp.m4.  (Bug#11529)
+       * merge-gnulib: Leave m4/gnulib-comp.m4's name alone.
+
        Assume C89 or later.
        * CPP-DEFINES: Remove NULL, const.
 

=== modified file 'admin/merge-gnulib'
--- a/admin/merge-gnulib        2012-05-21 02:33:13 +0000
+++ b/admin/merge-gnulib        2012-05-21 19:04:11 +0000
@@ -79,10 +79,8 @@
   exit 1
 }
 
-cp -- "$src"m4/gl-comp.m4 "$src"m4/gnulib-comp.m4 &&
 "$gnulib_srcdir"/gnulib-tool --dir="$src" $GNULIB_TOOL_FLAGS $GNULIB_MODULES &&
 rm -- "$src"m4/gnulib-cache.m4 "$src"m4/warn-on-use.m4 &&
-mv -- "$src"m4/gnulib-comp.m4 "$src"m4/gl-comp.m4 &&
 cp -- "$gnulib_srcdir"/build-aux/texinfo.tex "$src"doc/misc &&
 cp -- "$gnulib_srcdir"/build-aux/move-if-change "$src"build-aux &&
 autoreconf -i -I m4 -- ${src:+"$src"}

=== renamed file 'm4/gl-comp.m4' => 'm4/gnulib-comp.m4'