summaryrefslogtreecommitdiff
path: root/INSTALL
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2010-05-26 22:43:27 -0700
committerGlenn Morris <rgm@gnu.org>2010-05-26 22:43:27 -0700
commit81ac4f35366bfc525fa6ed89e0b5aaa90a05c902 (patch)
treee77b927e7e5fcf2d0ac05bcacb13baa10ed4b285 /INSTALL
parent11e4d8c0d35ec52819d5ce11176fc1f53b9890e0 (diff)
downloademacs-81ac4f35366bfc525fa6ed89e0b5aaa90a05c902.tar.gz
Do not preprocess src/Makefile.in.
* configure.in: Do not preprocess src/Makefile.in. (cpp_undefs, CPP_NEED_TRADITIONAL): Remove. (AC_EGREP_CPP): Test no longer needed. * configure: Regenerate. * config.bat: Do not preprocess src/Makefile.in. * make-dist: No more Makefile.c files. * INSTALL, src/README: Makefiles are not preprocessed. * src/Makefile.in, src/autodeps.mk, src/deps.mk, src/ns.mk: Convert comments to Makefile format. * lib-src/Makefile.in (distclean): No more Makefile.c. * src/Makefile.in (bootstrap-clean): No more Makefile.c. * admin/notes/cpp: Remove file. * admin/quick-install-emacs (AVOID): No more Makefile.c files. * etc/PROBLEMS, etc/MACHINES: Remove details of cpp problems which can no longer occur.
Diffstat (limited to 'INSTALL')
-rw-r--r--INSTALL26
1 files changed, 10 insertions, 16 deletions
diff --git a/INSTALL b/INSTALL
index 040b25f6d6d..35238fc21a4 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,6 +1,7 @@
GNU Emacs Installation Guide
Copyright (C) 1992, 1994, 1996, 1997, 2000, 2001, 2002, 2003, 2004,
-2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+ 2005, 2006, 2007, 2008, 2009, 2010
+ Free Software Foundation, Inc.
See the end of the file for license conditions.
@@ -686,8 +687,8 @@ when running make in the subdirectories.
CONFIGURATION BY HAND
-Instead of running the `configure' program, you have to perform the
-following steps.
+This should not be necessary and is not recommended. Instead of
+running the `configure' program, you have to perform the following steps.
1) Copy `./src/config.in' to `./src/config.h'.
@@ -701,22 +702,15 @@ the appropriate system and architecture description files.
2) Edit `./src/config.h' to set the right options for your system. If
you need to override any of the definitions in the s/*.h and m/*.h
files for your system and machine, do so by editing config.h, not by
-changing the s/*.h and m/*.h files. Occasionally you may need to
-redefine parameters used in `./lib-src/movemail.c'.
+changing the s/*.h and m/*.h files.
-3) Create src/Makefile and lib-src/Makefile from the corresponding
-`Makefile.in' files. First copy `Makefile.in' to `Makefile.c',
-then edit in appropriate substitutions for the @...@ constructs,
-and then copy the shell commands near the end of `configure'
-that run cpp to construct `Makefile'.
-
-4) Create `Makefile' files in various other directories
-from the corresponding `Makefile.in' files. This isn't so hard,
-just a matter of substitution.
+3) Create `Makefile' files in various directories from the
+corresponding `Makefile.in' files. This isn't so hard, just a matter
+of editing in appropriate substitutions for the @...@ constructs.
The `configure' script is built from `configure.in' by the `autoconf'
-program. You need version 2.51 or newer of `autoconf' to rebuild
-`configure'.
+program. You need at least the version of autoconf specified in the
+AC_PREREQ(...) command to rebuild `configure' from `configure.in'.
BUILDING GNU EMACS BY HAND