aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2012-05-21 18:19:43 -0700
committerPaul Eggert2012-05-21 18:19:43 -0700
commitec21c7f8eec5b9d67c4ef9052562c910c1d1278e (patch)
tree43794ee5c5380097ea60284ae8eec0899c5a836c
parent39078e4aed2ee94d978329e16953b038c919f2e9 (diff)
downloademacs-ec21c7f8eec5b9d67c4ef9052562c910c1d1278e.tar.gz
emacs-ec21c7f8eec5b9d67c4ef9052562c910c1d1278e.zip
* Makefile.in (ACLOCAL_INPUTS): Fix up gnulib-comp.m4 name. (Bug#11529)
Without this further fix, aclocal was being invoked unnecessarily.
-rw-r--r--ChangeLog5
-rw-r--r--Makefile.in4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 29b8b2385c5..f70731e0e67 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
12012-05-22 Paul Eggert <eggert@cs.ucla.edu>
2
3 * Makefile.in (ACLOCAL_INPUTS): Fix up gnulib-comp.m4 name. (Bug#11529)
4 Without this further fix, aclocal was being invoked unnecessarily.
5
12012-05-22 Glenn Morris <rgm@gnu.org> 62012-05-22 Glenn Morris <rgm@gnu.org>
2 7
3 * Makefile.in (blessmail, install-arch-dep, uninstall): 8 * 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'`
272# are treated separately. 272# are treated separately.
273# quail appears twice because in out-of-tree builds, it exists twice. 273# quail appears twice because in out-of-tree builds, it exists twice.
274COPYDIR = ${srcdir}/etc ${srcdir}/lisp ${srcdir}/leim/ja-dic ${srcdir}/leim/quail leim/quail 274COPYDIR = ${srcdir}/etc ${srcdir}/lisp ${srcdir}/leim/ja-dic ${srcdir}/leim/quail leim/quail
275COPYDESTS = $(DESTDIR)${etcdir} $(DESTDIR)${lispdir} $(DESTDIR)${leimdir}/ja-dic $(DESTDIR)${leimdir}/quail $(DESTDIR)${leimdir}/quail 275COPYDESTS = $(DESTDIR)${etcdir} $(DESTDIR)${lispdir} $(DESTDIR)${leimdir}/ja-dic $(DESTDIR)${leimdir}/quail $(DESTDIR)${leimdir}/quail
276 276
277all: ${SUBDIR} 277all: ${SUBDIR}
278 278
@@ -365,7 +365,7 @@ AUTOCONF_INPUTS = @MAINT@ $(srcdir)/configure.in $(srcdir)/aclocal.m4
365$(srcdir)/configure: $(AUTOCONF_INPUTS) 365$(srcdir)/configure: $(AUTOCONF_INPUTS)
366 cd ${srcdir} && autoconf 366 cd ${srcdir} && autoconf
367 367
368ACLOCAL_INPUTS = @MAINT@ $(srcdir)/m4/$(DOS_gnulib_comp.m4) 368ACLOCAL_INPUTS = @MAINT@ $(srcdir)/m4/gnulib-comp.m4
369$(srcdir)/aclocal.m4: $(ACLOCAL_INPUTS) 369$(srcdir)/aclocal.m4: $(ACLOCAL_INPUTS)
370 cd $(srcdir) && aclocal -I m4 370 cd $(srcdir) && aclocal -I m4
371 371