diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2012-05-21 12:04:11 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2012-05-21 12:04:11 -0700 |
| commit | fb77d37e482531da9da27bec77c87a56c6f5ce40 (patch) | |
| tree | b49c786b8ce6280a946947c7d38dbffcd8c08f06 | |
| parent | 261cb4bb750143d8078bb27a343e0d9560b884df (diff) | |
| download | emacs-fb77d37e482531da9da27bec77c87a56c6f5ce40.tar.gz | |
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.
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | admin/ChangeLog | 3 | ||||
| -rwxr-xr-x | admin/merge-gnulib | 2 | ||||
| -rw-r--r-- | m4/gnulib-comp.m4 (renamed from m4/gl-comp.m4) | 0 |
4 files changed, 12 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index 6f1c9254bd3..56259e0ffc9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,14 @@ 2012-05-21 Paul Eggert <eggert@cs.ucla.edu> + 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 1da647a803d..5ee31127006 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog @@ -1,5 +1,8 @@ 2012-05-21 Paul Eggert <eggert@cs.ucla.edu> + 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 57b71ee4a74..fa082d94664 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 index 73a26c41324..73a26c41324 100644 --- a/m4/gl-comp.m4 +++ b/m4/gnulib-comp.m4 |