diff options
| author | Paul Eggert | 2011-01-21 23:18:23 -0800 |
|---|---|---|
| committer | Paul Eggert | 2011-01-21 23:18:23 -0800 |
| commit | e02ea74b7e42db69e6bb333a176d26b2f409752e (patch) | |
| tree | 7d5462c37f1d85c0424fffd433092b4ffb6e80cf /Makefile.in | |
| parent | 4936e3ba93d6952ad150f7c599d8003b00cebc8e (diff) | |
| download | emacs-e02ea74b7e42db69e6bb333a176d26b2f409752e.tar.gz emacs-e02ea74b7e42db69e6bb333a176d26b2f409752e.zip | |
aclocal.m4: put this file back into repository
This way, we don't have to assume that the maintainer has
the automake package installed. See
<http://lists.gnu.org/archive/html/emacs-devel/2011-01/msg00746.html>.
* .bzrignore: Remove aclocal.m4, undoing the previous change.
* Makefile.in (top_maintainer_clean): Do not remove aclocal.m4,
undoing the previous change.
* aclocal.m4: New file (actually, resurrected).
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Makefile.in b/Makefile.in index 3d8f6303e10..4e21fc750ac 100644 --- a/Makefile.in +++ b/Makefile.in | |||
| @@ -833,8 +833,7 @@ bootstrap-clean: FRC | |||
| 833 | ### begin to build the program. | 833 | ### begin to build the program. |
| 834 | top_maintainer_clean=\ | 834 | top_maintainer_clean=\ |
| 835 | ${top_distclean}; \ | 835 | ${top_distclean}; \ |
| 836 | rm -fr autom4te.cache; \ | 836 | rm -fr autom4te.cache |
| 837 | rm -f aclocal.m4 | ||
| 838 | maintainer-clean: bootstrap-clean FRC | 837 | maintainer-clean: bootstrap-clean FRC |
| 839 | (cd src; $(MAKE) $(MFLAGS) maintainer-clean) | 838 | (cd src; $(MAKE) $(MFLAGS) maintainer-clean) |
| 840 | (cd lisp; $(MAKE) $(MFLAGS) maintainer-clean) | 839 | (cd lisp; $(MAKE) $(MFLAGS) maintainer-clean) |