X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=INSTALL;h=a2e2d618b65ab6d6eb70f42201abcc2f20709add;hb=484a9acf0e463a588cc050229aabf1cb453b89c4;hp=b1dca8cf593b7116c751e6eb38aaaa9e6137686d;hpb=0af41ea47efc982377e2a9afb503c2b0bce2e853;p=mmh

diff --git a/INSTALL b/INSTALL
index b1dca8c..a2e2d61 100644
--- a/INSTALL
+++ b/INSTALL
@@ -50,14 +50,7 @@ need an ANSI C compiler such as gcc.
 
 3) make
 
-4) make test
-
-   This takes a bit of time (under 2 minutes on a modern machine) but
-   is highly recommended.  "make test" copies your configuration and
-   rebuilds nmh completely in a sandbox, so you can test without
-   disturbing an existing nmh installation or any of your nmh folders.
-
-5) make install
+4) make install
 
    Note that if you have [n]mh files in your install directories with
    the same names as the files being installed, the old ones will get
@@ -68,7 +61,7 @@ need an ANSI C compiler such as gcc.
    make is processing that directory to see if you need to merge
    changes from *.prev files into the new versions.
 
-6) Edit the file `mts.conf' (installed in the nmh `etc' directory)
+5) Edit the file `mts.conf' (installed in the nmh `etc' directory)
    and make any necessary changes for the mail transport interface
    you are using.
 
@@ -102,7 +95,7 @@ need an ANSI C compiler such as gcc.
    default value allows the most flexibility.  See the discussion of the
    --enable-masquerade configure option below).
 
-7) Edit the file `mhn.defaults' (installed in the nmh `etc' directory).
+6) Edit the file `mhn.defaults' (installed in the nmh `etc' directory).
    This file contains the default profile entries for the nmh command
    `mhn' and is created by the script `mhn.defaults.sh'.  This script
    will search a generic path (essentially your $PATH) for programs to
@@ -123,6 +116,13 @@ need an ANSI C compiler such as gcc.
    "MH & xmh: Email for Users and Programmers", 3rd edition, by Jerry Peek,
    on the Internet at <http://rand-mh.sourceforge.net/book/mh/confmhn.html>.
 
+7) make check
+
+   This takes a bit of time, around one minute on a modern machine,
+   but is highly recommended.  If you're going to run it, it must be
+   run after installation.  If you want to run the nmh test suite
+   prior to installation, use "make distcheck".
+
 8) Add an optional global mh.profile, if desired.  This profile should be
    placed in the nmh `etc' directory with the name `mh.profile'.  This
    file will be used to construct the initial .mh_profile of a new nmh
@@ -135,30 +135,21 @@ Compiler options, or using a different compiler
 By default, configure will use the "gcc" compiler if found.  You can
 use a different compiler, or add unusual options for compiling or
 linking that the "configure" script does not know about, by giving
-"configure" initial values for these in its environment.  Using a
-Bourne-compatible shell, such as sh, ksh, zsh, or bash, you can do
-that on the command line like this:
-    CC=c89 CFLAGS=-O2 LIBS=-lposix ./configure
+"configure" initial values for these on its command line or in its
+environment.  For example,
 
-Or on systems that have the "env" program, you can do it like this:
-    env CPPFLAGS=-I/usr/local/include LDFLAGS=-s ./configure
+    ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
 
-If you want to add to, not replace, compile flags, you can use OURDEFS
-with env or like this:
-    OURDEFS='-Wextra -Wno-sign-compare' ./configure
+If you wish to add options that are only used at compile time instead of
+link time, you can use the CPPFLAGS variable:
 
-If you want to add to both compile and link flags at build time
-without putting them in the configuration, you can use an otherwise
-unused Makefile macro, like this:
-    make AM_CFLAGS=--coverage
+   ./configure CPPFLAGS='-Wextra -Wno-sign-compare'
 
-That does not include that setting in the configuration, so you will
-have to repeat it if you re-run "make".  One example would be if you
-build the test suite as a separate step:
-    make test AM_CFLAGS=--coverage
+If you want to add to both compile and link flags at build time
+without putting them in the configuration, you can use the AM_CFLAGS
+Makefile macro:
 
-Though note that the Makefile test target depends on the default
-target, so both be can built in one step with "make test".
+    make AM_CFLAGS=--coverage
 
 ----------------------------------------
 Building nmh on additional architectures
@@ -181,7 +172,7 @@ run the "configure" script.  "configure" automatically checks for the
 source code in the directory that "configure" is in.  For example,
 
     cd /usr/local/solaris/nmh
-    /usr/local/src/nmh-1.0/configure
+    /usr/local/src/nmh-1.5/configure
     make
 
 ---------------------