diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2012-05-21 18:19:43 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2012-05-21 18:19:43 -0700 |
| commit | ec21c7f8eec5b9d67c4ef9052562c910c1d1278e (patch) | |
| tree | 43794ee5c5380097ea60284ae8eec0899c5a836c | |
| parent | 39078e4aed2ee94d978329e16953b038c919f2e9 (diff) | |
| download | emacs-ec21c7f8eec5b9d67c4ef9052562c910c1d1278e.tar.gz | |
* Makefile.in (ACLOCAL_INPUTS): Fix up gnulib-comp.m4 name. (Bug#11529)
Without this further fix, aclocal was being invoked unnecessarily.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Makefile.in | 4 |
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 @@ +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 |