From 0ec9847809a57b34d44791b4665df7969071bac4 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Tue, 13 May 2014 16:15:01 -0700 Subject: [PATCH] * merge-gnulib: Defer to autogen.sh for ACLOCAL_PATH computation. --- admin/ChangeLog | 4 ++++ admin/merge-gnulib | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/admin/ChangeLog b/admin/ChangeLog index 87da4f7e26..5eeec00cbd 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog @@ -1,3 +1,7 @@ +2014-05-13 Paul Eggert + + * merge-gnulib: Defer to autogen.sh for ACLOCAL_PATH computation. + 2014-05-12 Glenn Morris * find-gc.el: Move here from ../lisp/emacs-lisp. diff --git a/admin/merge-gnulib b/admin/merge-gnulib index 6c0dffb6dc..b93d12fbd2 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 -- 2.20.1