X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=INSTALL;h=6a5bcf0a2d3864c3cd6bb8bb29f97ce8f9b3f013;hb=1c99711ede25860b24750aab9c529a49c53756ae;hp=f64fe9ebf39a1cb86940d602d7dfaee5048598c1;hpb=c2df36c86f70fb671aaf9c87469ff37a34f29427;p=openldap

diff --git a/INSTALL b/INSTALL
index f64fe9ebf3..6a5bcf0a2d 100644
--- a/INSTALL
+++ b/INSTALL
@@ -2,7 +2,7 @@ Making and Installing the OpenLDAP Distribution
 ===============================================
 
 This file provides brief instructions on how to build and install
-OpenLDAP on UNIX (and UNIX-like) system.  More detailed information
+OpenLDAP on UNIX (and UNIX-like) systems.  More detailed information
 and instructions can be found in The OpenLDAP Administrator's Guide
 (available from http://www.openldap.org/doc/).
 
@@ -32,13 +32,13 @@ Making and Installing the OpenLDAP Distribution
 
      to list available configuration options.
 
-     Note also that the configure script uses environmental variables
-     for determining compiler/linker options including:
+     The configure script also looks for compiler/linker options on
+     the command line and in the environment.  These include:
 
         Variable        Description     Example
         CC              C compiler      gcc
         CFLAGS          C flags         -O -g
-        CPPFLAGS        cpp flags       -I/path/include -DFOO=42
+        CPPFLAGS        cpp flags       -I/path/include -D__FOO__=42
         LDFLAGS         ld flags        -L/usr/local/lib
         LIBS            libraries       -llib
         PATH            command path    /usr/local/bin:/usr/bin:/bin
@@ -47,14 +47,14 @@ Making and Installing the OpenLDAP Distribution
 
 3.   Configure the build system:
 
-        % [env settings] ./configure [options]
+        % ./configure [options] [var=value ...]
 
      If all goes well, the configure script will automatically detect
      the appropriate settings.  If the configure script fails, you
      should read the config.log file that it generated to see what it
-     was trying to do and exactly what failed.  You may need to specify
-     additional options and/or environment variables besides those
-     listed above to obtain desired results, depending on your operating
+     was trying to do and exactly what failed.  You may need to
+     specify additional options and/or variables besides those listed
+     above to obtain desired results, depending on your operating
      system. The Platform Hints section of the FAQ provides help for
      operating system related problems.
 
@@ -73,8 +73,8 @@ Making and Installing the OpenLDAP Distribution
 
 6.   Test the standalone system:
 
-     This step requires the standalone LDAP server, slapd(8), with
-     BDB or HDB support.
+     This step requires the standalone LDAP server, slapd(8), with HDB
+     and/or BDB support.
 
         % make test
 
@@ -83,7 +83,7 @@ Making and Installing the OpenLDAP Distribution
      settings.  You may want to consult the Installation section of
      the FAQ if you have not done so already.
 
-7.   Install the software.  You may need to be come the super-user
+7.   Install the software.  You may need to become the super-user
      (e.g. root) to do this (depending on where you are installing
      things):
 
@@ -107,7 +107,7 @@ $OpenLDAP: pkg/openldap-guide/release/install.sdf,v 1.16 2002/02/18
 
 This work is part of OpenLDAP Software <http://www.openldap.org/>.
 
-Copyright 1998-2011 The OpenLDAP Foundation.
+Copyright 1998-2013 The OpenLDAP Foundation.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without