From fb77d37e482531da9da27bec77c87a56c6f5ce40 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Mon, 21 May 2012 12:04:11 -0700 Subject: [PATCH] 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. --- ChangeLog | 9 +++++++++ admin/ChangeLog | 3 +++ admin/merge-gnulib | 2 -- m4/{gl-comp.m4 => gnulib-comp.m4} | 0 4 files changed, 12 insertions(+), 2 deletions(-) rename m4/{gl-comp.m4 => gnulib-comp.m4} (100%) diff --git a/ChangeLog b/ChangeLog index 6f1c9254bd..56259e0ffc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,14 @@ 2012-05-21 Paul Eggert + 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. diff --git a/admin/ChangeLog b/admin/ChangeLog index 1da647a803..5ee3112700 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog @@ -1,5 +1,8 @@ 2012-05-21 Paul Eggert + 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. diff --git a/admin/merge-gnulib b/admin/merge-gnulib index 57b71ee4a7..fa082d9466 100755 --- a/admin/merge-gnulib +++ b/admin/merge-gnulib @@ -79,10 +79,8 @@ test -x "$gnulib_srcdir"/gnulib-tool || { 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"} diff --git a/m4/gl-comp.m4 b/m4/gnulib-comp.m4 similarity index 100% rename from m4/gl-comp.m4 rename to m4/gnulib-comp.m4 -- 2.20.1