1. 21 May, 2012 2 commits
    • Paul Eggert's avatar
      Use full name for m4/gnulib-comp.m4. (Bug#11529) · fb77d37e
      Paul Eggert authored
      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.
      fb77d37e
    • Paul Eggert's avatar
      Make merging from gnulib a script, not a makefile action. · 9b4ee616
      Paul Eggert authored
      Putting it in a makefile has some problems with reflection, as
      merging from gnulib updates 'configure', which can update the makefile.
      Putting it in a standalone script breaks this loop.
      * Makefile.in (gnulib_srcdir, $(gnulib_srcdir), DOS_gnulib_comp.m4)
      (GNULIB_MODULES, GNULIB_TOOL_FLAGS, sync-from-gnulib):
      Remove, moving the actions to the script admin/merge-gnulib.
      * admin/merge-gnulib: New script, with actions moved here from
      ../Makefile.in.
      9b4ee616