Commit 925e561d authored by Paul Eggert's avatar Paul Eggert

aclocal.m4: tweaks to regenerate more conveniently

This attempts to act better when the source is in a weird state.  See
<http://lists.gnu.org/archive/html/emacs-devel/2011-01/msg00734.html>.
* Makefile.in (am--refresh): Add aclocal.m4, configure, config.in.
* .bzrignore: Add aclocal.m4.
parent e425f18b
2011-01-21 Paul Eggert <eggert@cs.ucla.edu>
aclocal.m4: tweaks to regenerate more conveniently
This attempts to act better when the source is in a weird state. See
<http://lists.gnu.org/archive/html/emacs-devel/2011-01/msg00734.html>.
* Makefile.in (am--refresh): Add aclocal.m4, configure, config.in.
* .bzrignore: Add aclocal.m4.
2011-01-20 Paul Eggert <eggert@cs.ucla.edu>
aclocal.m4: omit auto-generated file from repository
......
......@@ -260,7 +260,7 @@ EMACSFULL = `echo emacs-${version}${EXEEXT} | sed '$(TRANSFORM)'`
# Subdirectories to make recursively. `lisp' is not included
# because the compiled lisp files are part of the distribution.
# leim is not included because it needs special handling.
#
#
# Actually, we now include `lisp' as well, since the compiled files
# are not included any more in case of bootstrap or in case Emacs was
# checked out from a VCS.
......@@ -414,7 +414,7 @@ $(srcdir)/aclocal.m4: $(ACLOCAL_INPUTS)
AUTOMAKE_INPUTS = @MAINT@ $(srcdir)/aclocal.m4 $(srcdir)/lib/Makefile.am
$(srcdir)/lib/Makefile.in: $(AUTOMAKE_INPUTS)
cd $(srcdir) && automake --gnu -a -c lib/Makefile
am--refresh:
am--refresh: $(srcdir)/aclocal.m4 $(srcdir)/configure $(srcdir)/src/config.in
.PHONY: am--refresh
$(srcdir)/src/config.in: $(srcdir)/src/stamp-h.in
......@@ -863,7 +863,7 @@ dist:
.PHONY: info dvi dist check html
info-real:
info-real:
(cd doc/emacs; $(MAKE) $(MFLAGS) info)
(cd doc/misc; $(MAKE) $(MFLAGS) info)
(cd doc/lispref; $(MAKE) $(MFLAGS) info)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment