[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r102909: Merge: build from gnulib a b
From: |
Paul Eggert |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r102909: Merge: build from gnulib a bit better; document autoreconf. |
Date: |
Wed, 19 Jan 2011 15:59:52 -0800 |
User-agent: |
Bazaar (2.0.3) |
------------------------------------------------------------
revno: 102909 [merge]
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Wed 2011-01-19 15:59:52 -0800
message:
Merge: build from gnulib a bit better; document autoreconf.
modified:
ChangeLog
Makefile.in
admin/ChangeLog
admin/make-tarball.txt
=== modified file 'ChangeLog'
--- a/ChangeLog 2011-01-18 05:23:52 +0000
+++ b/ChangeLog 2011-01-19 23:56:53 +0000
@@ -1,3 +1,10 @@
+2011-01-19 Paul Eggert <address@hidden>
+
+ Minor Makefile.in tweaks to build from gnulib better.
+ <http://lists.gnu.org/archive/html/emacs-devel/2011-01/msg00673.html>
+ * Makefile.in (sync-from-gnulib): Also run autoreconf -I m4.
+ (top_maintainer_clean): Don't remove aclocal.m4.
+
2011-01-18 Paul Eggert <address@hidden>
Minor cleanups for 'bzr status'
=== modified file 'Makefile.in'
--- a/Makefile.in 2011-01-18 05:23:52 +0000
+++ b/Makefile.in 2011-01-19 23:56:53 +0000
@@ -343,6 +343,7 @@
$(gnulib_srcdir)/build-aux/mkinstalldirs \
$(gnulib_srcdir)/build-aux/move-if-change \
$(srcdir)
+ cd $(srcdir) && autoreconf -I m4
.PHONY: sync-from-gnulib
# These targets should be "${SUBDIR} without `src'".
@@ -832,8 +833,7 @@
### begin to build the program.
top_maintainer_clean=\
${top_distclean}; \
- rm -fr autom4te.cache; \
- rm -f aclocal.m4
+ rm -fr autom4te.cache
maintainer-clean: bootstrap-clean FRC
(cd src; $(MAKE) $(MFLAGS) maintainer-clean)
(cd lisp; $(MAKE) $(MFLAGS) maintainer-clean)
=== modified file 'admin/ChangeLog'
--- a/admin/ChangeLog 2011-01-17 22:11:13 +0000
+++ b/admin/ChangeLog 2011-01-19 23:56:42 +0000
@@ -1,3 +1,9 @@
+2011-01-19 Paul Eggert <address@hidden>
+
+ * make-tarball.txt: Suggest 'autoreconf -I m4 --force'
+ rather than doing rm and autoconf by hand. See
+ <http://lists.gnu.org/archive/html/emacs-devel/2011-01/msg00673.html>.
+
2011-01-17 Paul Eggert <address@hidden>
* notes/bzr (Installing changes from gnulib): New section.
=== modified file 'admin/make-tarball.txt'
--- a/admin/make-tarball.txt 2010-10-22 03:28:21 +0000
+++ b/admin/make-tarball.txt 2011-01-19 23:56:42 +0000
@@ -28,7 +28,7 @@
refer to a newer release of Emacs. (This is probably needed only
when preparing a major Emacs release, or branching for it.)
-5. rm configure src/config.in; autoconf; autoheader
+5. autoreconf -I m4 --force
make bootstrap
6. Commit configure, src/config.in, etc/AUTHORS, all the files changed
@@ -107,4 +107,3 @@
13. For a pretest, announce it on emacs-devel and BCC the pretesters.
For a release, announce it on address@hidden,
address@hidden, and emacs-devel.
-
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r102909: Merge: build from gnulib a bit better; document autoreconf.,
Paul Eggert <=