diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2014-05-13 16:15:01 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2014-05-13 16:15:01 -0700 |
| commit | 0ec9847809a57b34d44791b4665df7969071bac4 (patch) | |
| tree | 85c69d4572c627cdafba3c986b2830c815ee859a /admin | |
| parent | 3246c8b11a6017b423fa73c3965ab184320b8a7c (diff) | |
| download | emacs-0ec9847809a57b34d44791b4665df7969071bac4.tar.gz | |
* merge-gnulib: Defer to autogen.sh for ACLOCAL_PATH computation.
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/ChangeLog | 4 | ||||
| -rwxr-xr-x | admin/merge-gnulib | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/admin/ChangeLog b/admin/ChangeLog index 87da4f7e26b..5eeec00cbdb 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog @@ -1,3 +1,7 @@ +2014-05-13 Paul Eggert <eggert@cs.ucla.edu> + + * merge-gnulib: Defer to autogen.sh for ACLOCAL_PATH computation. + 2014-05-12 Glenn Morris <rgm@gnu.org> * find-gc.el: Move here from ../lisp/emacs-lisp. diff --git a/admin/merge-gnulib b/admin/merge-gnulib index 6c0dffb6dce..b93d12fbd20 100755 --- a/admin/merge-gnulib +++ b/admin/merge-gnulib @@ -96,4 +96,5 @@ rm -- "$src"lib/gl_openssl.h "$src"m4/fcntl-o.m4 "$src"m4/gl-openssl.m4 \ "$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 |