* Makefile.in (ACLOCAL_INPUTS): Omit unnecessary use of 'wildcard'.

diff --git a/ChangeLog b/ChangeLog
index 534a34d103f451bf5891a548de311ed5a978ecb9..70cde66b9c719bd7f60a4bff89fac44e7a66a5f5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,11 +1,12 @@
 2014-10-23  Paul Eggert  <eggert@cs.ucla.edu>
 
+       * Makefile.in (ACLOCAL_INPUTS): Omit unnecessary use of 'wildcard'.
+
        Fix race in 'make info/dir', and speed it up.
        * Makefile.in (AWK, srcdir_doc_info_dir_inputs, info_dir_inputs):
        New macros.
        (clean): Remove info-dir.*.
        (info_dir_deps): Depend on make-info-dir too.
-       Fix bug with wildcards that weren't expanded.
        (${srcdir}/info/dir): Make sure info directory exists.
        Don't call pwd; just redirect make-info-dir's stdout to temp file.
        * build-aux/make-info-dir: Send output to stdout.

diff --git a/Makefile.in b/Makefile.in
index 57d97d7eafca67e9416cbaa03722a70f814d640b..2f7294073b764b5d74054d3f69009b86d6afc18d 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -417,7 +417,7 @@ $(srcdir)/configure: $(AUTOCONF_INPUTS)
        cd ${srcdir} && ${AUTOCONF}
 
 ACLOCAL_PATH = @ACLOCAL_PATH@
-ACLOCAL_INPUTS = $(srcdir)/configure.ac $(wildcard $(srcdir)/m4/*.m4)
+ACLOCAL_INPUTS = $(srcdir)/configure.ac $(srcdir)/m4/*.m4
 $(srcdir)/aclocal.m4: $(ACLOCAL_INPUTS)
        cd $(srcdir) && ACLOCAL_PATH='$(ACLOCAL_PATH)' $(ACLOCAL) -I m4
 

diff --git a/src/ChangeLog b/src/ChangeLog
index 91f910aa6f9c2e5beb4649594d6c18785ccf0456..d74d2a4f09295cf0fbf4f3e699ba869bc4941410 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2014-10-23  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * Makefile.in (ACLOCAL_INPUTS): Omit unnecessary use of 'wildcard'.
+
 2014-10-22  Eli Zaretskii  <eliz@gnu.org>
 
        Optimize redisplay of simple bracketed text.

diff --git a/src/Makefile.in b/src/Makefile.in
index 36e145744b30c0a268fa215f32b052a477fea4df..270119ee2640694153362389bae1d00c1feac395 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -535,7 +535,7 @@ $(oldXMenudir)/libXMenu11.a: FORCE
 FORCE:
 .PHONY: FORCE
 
-ACLOCAL_INPUTS = $(top_srcdir)/configure.ac $(wildcard $(top_srcdir)/m4/*.m4)
+ACLOCAL_INPUTS = $(top_srcdir)/configure.ac $(top_srcdir)/m4/*.m4
 AUTOCONF_INPUTS = $(top_srcdir)/configure.ac $(top_srcdir)/aclocal.m4
 $(top_srcdir)/aclocal.m4: $(ACLOCAL_INPUTS)
 $(top_srcdir)/configure config.in: $(AUTOCONF_INPUTS)