From: Paul Eggert <eggert@cs.ucla.edu>
Date: Tue, 22 May 2012 01:19:43 +0000 (-0700)
Subject: * Makefile.in (ACLOCAL_INPUTS): Fix up gnulib-comp.m4 name.  (Bug#11529)
X-Git-Tag: emacs-24.2.90~471^2~6^2~110^2~30
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ec21c7f8eec5b9d67c4ef9052562c910c1d1278e;p=emacs.git

* Makefile.in (ACLOCAL_INPUTS): Fix up gnulib-comp.m4 name.  (Bug#11529)

Without this further fix, aclocal was being invoked unnecessarily.
---

diff --git a/ChangeLog b/ChangeLog
index 29b8b2385c5..f70731e0e67 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-05-22  Paul Eggert  <eggert@cs.ucla.edu>
+
+	* Makefile.in (ACLOCAL_INPUTS): Fix up gnulib-comp.m4 name.  (Bug#11529)
+	Without this further fix, aclocal was being invoked unnecessarily.
+
 2012-05-22  Glenn Morris  <rgm@gnu.org>
 
 	* Makefile.in (blessmail, install-arch-dep, uninstall):
diff --git a/Makefile.in b/Makefile.in
index 0043e1b197c..699c4794d92 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -272,7 +272,7 @@ SUBDIR_MAKEFILES = `echo $(SUBDIR_MAKEFILES_IN:.in=) | sed 's|$(srcdir)/||g'`
 # are treated separately.
 # quail appears twice because in out-of-tree builds, it exists twice.
 COPYDIR = ${srcdir}/etc ${srcdir}/lisp ${srcdir}/leim/ja-dic ${srcdir}/leim/quail leim/quail
-COPYDESTS = $(DESTDIR)${etcdir} $(DESTDIR)${lispdir} $(DESTDIR)${leimdir}/ja-dic $(DESTDIR)${leimdir}/quail $(DESTDIR)${leimdir}/quail 
+COPYDESTS = $(DESTDIR)${etcdir} $(DESTDIR)${lispdir} $(DESTDIR)${leimdir}/ja-dic $(DESTDIR)${leimdir}/quail $(DESTDIR)${leimdir}/quail
 
 all: ${SUBDIR}
 
@@ -365,7 +365,7 @@ AUTOCONF_INPUTS = @MAINT@ $(srcdir)/configure.in $(srcdir)/aclocal.m4
 $(srcdir)/configure: $(AUTOCONF_INPUTS)
 	cd ${srcdir} && autoconf
 
-ACLOCAL_INPUTS = @MAINT@ $(srcdir)/m4/$(DOS_gnulib_comp.m4)
+ACLOCAL_INPUTS = @MAINT@ $(srcdir)/m4/gnulib-comp.m4
 $(srcdir)/aclocal.m4: $(ACLOCAL_INPUTS)
 	cd $(srcdir) && aclocal -I m4