aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--INSTALL2
-rw-r--r--configure.ac6
-rw-r--r--etc/CONTRIBUTE2
-rw-r--r--nt/INSTALL17
5 files changed, 20 insertions, 13 deletions
diff --git a/ChangeLog b/ChangeLog
index e2ceaf23ff4..021f0e05473 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
12014-01-09 Eric S. Raymond <esr@thyrsus.com>
2
3 * INSTALL, configure.ac, etc/CONTRIBUTE, nt/INSTALL: Remove
4 unnecessarily specific references to Bazaar that could better
5 simply be to the repository.
6
12014-01-08 Eric S. Raymond <esr@thyrsus.com> 72014-01-08 Eric S. Raymond <esr@thyrsus.com>
2 8
3 * INSTALL.BZR: Renamed to INSTALL.REPO 9 * INSTALL.BZR: Renamed to INSTALL.REPO
diff --git a/INSTALL b/INSTALL
index 5e3dd22de72..29a6339d365 100644
--- a/INSTALL
+++ b/INSTALL
@@ -7,7 +7,7 @@ See the end of the file for license conditions.
7This file contains general information on building GNU Emacs. 7This file contains general information on building GNU Emacs.
8For more information specific to the MS-Windows, GNUstep/Mac OS X, and 8For more information specific to the MS-Windows, GNUstep/Mac OS X, and
9MS-DOS ports, also read the files nt/INSTALL, nextstep/INSTALL, and 9MS-DOS ports, also read the files nt/INSTALL, nextstep/INSTALL, and
10msdos/INSTALL. For information about building from a Bazaar checkout 10msdos/INSTALL. For information about building from a repository checkout
11(rather than a release), also read the file INSTALL.REPO. 11(rather than a release), also read the file INSTALL.REPO.
12 12
13 13
diff --git a/configure.ac b/configure.ac
index 14b88943ea4..b3d28d1d720 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1025,11 +1025,11 @@ fi
1025## pre-built, and not deleted by the normal clean rules. makeinfo is 1025## pre-built, and not deleted by the normal clean rules. makeinfo is
1026## therefore in the category of "special tools" not normally required, which 1026## therefore in the category of "special tools" not normally required, which
1027## configure does not have to check for (eg autoconf itself). 1027## configure does not have to check for (eg autoconf itself).
1028## In a Bazaar checkout on the other hand, the manuals are not included. 1028## In a repository checkout on the other hand, the manuals are not included.
1029## So makeinfo is a requirement to build from Bazaar, and configure 1029## So makeinfo is a requirement to build from the repository, and configure
1030## should test for it as it does for any other build requirement. 1030## should test for it as it does for any other build requirement.
1031## We use the presence of $srcdir/info/emacs to distinguish a release, 1031## We use the presence of $srcdir/info/emacs to distinguish a release,
1032## with pre-built manuals, from a Bazaar checkout. 1032## with pre-built manuals, from a repository checkout.
1033HAVE_MAKEINFO=yes 1033HAVE_MAKEINFO=yes
1034 1034
1035if test "$MAKEINFO" = "no"; then 1035if test "$MAKEINFO" = "no"; then
diff --git a/etc/CONTRIBUTE b/etc/CONTRIBUTE
index bbabeb3de05..cba833cf584 100644
--- a/etc/CONTRIBUTE
+++ b/etc/CONTRIBUTE
@@ -159,7 +159,7 @@ included in Emacs.
159** Write access to the Emacs repository. 159** Write access to the Emacs repository.
160 160
161Once you become a frequent contributor to Emacs, we can consider 161Once you become a frequent contributor to Emacs, we can consider
162giving you write access to the Bazaar repository. 162giving you write access to the version-control repository.
163 163
164 164
165** Emacs Mailing lists. 165** Emacs Mailing lists.
diff --git a/nt/INSTALL b/nt/INSTALL
index 8fcd780df8b..088c5f9bc0d 100644
--- a/nt/INSTALL
+++ b/nt/INSTALL
@@ -122,7 +122,7 @@ Windows 9X as well).
122 optional libraries near the end of this document, before you start 122 optional libraries near the end of this document, before you start
123 the build. Also, consider installing additional MinGW packages that 123 the build. Also, consider installing additional MinGW packages that
124 are required/recommended, especially if you are building from the 124 are required/recommended, especially if you are building from the
125 Bazaar repository, as described in the next section. 125 repository, as described in the next section.
126 126
127** Installing MinGW and MSYS manually 127** Installing MinGW and MSYS manually
128 128
@@ -166,7 +166,7 @@ Windows 9X as well).
166 been warned! 166 been warned!
167 167
168 Additional MinGW packages are required/recommended, especially if 168 Additional MinGW packages are required/recommended, especially if
169 you are building from the Bazaar repository: 169 you are building from the repository:
170 170
171 . Texinfo (needed to produce the Info manuals when building from 171 . Texinfo (needed to produce the Info manuals when building from
172 bzr, and for "make install") 172 bzr, and for "make install")
@@ -218,9 +218,9 @@ Windows 9X as well).
218 - mktemp 218 - mktemp
219 219
220 These should only be needed if you intend to build development 220 These should only be needed if you intend to build development
221 versions of Emacs from the Bazaar repository. 221 versions of Emacs from the repository.
222 222
223 . Additional packages (needed only if building from the Bazaar 223 . Additional packages (needed only if building from the
224 repository): Automake and Autoconf. They are available from 224 repository): Automake and Autoconf. They are available from
225 here: 225 here:
226 226
@@ -279,7 +279,7 @@ Windows 9X as well).
279 If you are building a release or pretest tarball, skip this section, 279 If you are building a release or pretest tarball, skip this section,
280 because the configure script is already present in the tarball. 280 because the configure script is already present in the tarball.
281 281
282 To build a development snapshot from the Emacs Bazaar repository, 282 To build a development snapshot from the Emacs repository,
283 you will first need to generate the configure script and a few other 283 you will first need to generate the configure script and a few other
284 auto-generated files. 284 auto-generated files.
285 285
@@ -449,7 +449,7 @@ Windows 9X as well).
449* Make targets 449* Make targets
450 450
451 The following make targets may be used by users building the source 451 The following make targets may be used by users building the source
452 distribution, or users who have checked out of Bazaar after 452 distribution, or users who have checked out of the repository after
453 an initial bootstrapping. 453 an initial bootstrapping.
454 454
455 make 455 make
@@ -471,7 +471,8 @@ Windows 9X as well).
471 necessary to run the configure script followed by "make", in order 471 necessary to run the configure script followed by "make", in order
472 to rebuild. 472 to rebuild.
473 473
474 The following targets are intended only for use with the Bazaar sources. 474 The following targets are intended only for use with the repository
475 sources.
475 476
476 make bootstrap 477 make bootstrap
477 Removes all the auto-generated files and all the *.elc byte-compiled 478 Removes all the auto-generated files and all the *.elc byte-compiled
@@ -481,7 +482,7 @@ Windows 9X as well).
481 482
482 make maintainer-clean 483 make maintainer-clean
483 Removes everything that can be recreated, including compiled Lisp 484 Removes everything that can be recreated, including compiled Lisp
484 files, to get back to the state of a fresh Bazaar tree. After make 485 files, to get back to the state of a fresh repository tree. After make
485 maintainer-clean, it is necessary to run configure and "make" or 486 maintainer-clean, it is necessary to run configure and "make" or
486 "make bootstrap" to rebuild. Occasionally it may be necessary to 487 "make bootstrap" to rebuild. Occasionally it may be necessary to
487 run this target after an update. 488 run this target after an update.