[Emacs-diffs] trunk r117099: * merge-gnulib: Defer to autogen.sh for ACLOCAL_PATH computation.

[Paul Eggert]

------------------------------------------------------------
revno: 117099
revision-id: address@hidden
parent: address@hidden
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Tue 2014-05-13 16:15:01 -0700
message:
  * merge-gnulib: Defer to autogen.sh for ACLOCAL_PATH computation.
modified:
  admin/ChangeLog                changelog-20091113204419-o5vbwnq5f7feedwu-2226
  admin/merge-gnulib             mergegnulib-20120521022411-ndnoaiok33j6dn0g-1

=== modified file 'admin/ChangeLog'
--- a/admin/ChangeLog   2014-05-12 06:59:30 +0000
+++ b/admin/ChangeLog   2014-05-13 23:15:01 +0000
@@ -1,3 +1,7 @@
+2014-05-13  Paul Eggert  <address@hidden>
+
+       * merge-gnulib: Defer to autogen.sh for ACLOCAL_PATH computation.
+
 2014-05-12  Glenn Morris  <address@hidden>
 
        * find-gc.el: Move here from ../lisp/emacs-lisp.

=== modified file 'admin/merge-gnulib'
--- a/admin/merge-gnulib        2014-03-07 18:57:11 +0000
+++ b/admin/merge-gnulib        2014-05-13 23:15:01 +0000
@@ -96,4 +96,5 @@
       "$src"m4/gnulib-cache.m4"$src" m4/warn-on-use.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"}
+{ test -z "$src" || cd "$src"; } &&
+./autogen.sh