X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=INSTALL;h=4474ff5db191acf2f449d59de68c2842c29ae5cf;hb=1d420df7178eb5fa491e40dbba517b89ede7fae5;hp=6aeab9006a210a289a0ae730312c8bb8045448dc;hpb=e3a4c4ec9c640c03612f90bec1e95bfc55a54947;p=openldap

diff --git a/INSTALL b/INSTALL
index 6aeab9006a..4474ff5db1 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,30 +32,37 @@ Making and Installing the OpenLDAP Distribution
 
      to list available configuration options.
 
-     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
 
-3.   Configure the build system
+     See doc/install/configure for generic configure documentation.
 
-        % [env settings] ./configure [options]
+3.   Configure the build system:
 
-     If all goes well, the configure script with automatically detect
-     the appropriate settings.  However, you may need to specify
-     options and/or environment variables to obtain desired results.
+        % ./configure [options] [var=value ...]
 
-4.   Build dependencies
+     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 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.
+
+4.   Build dependencies:
 
         % make depend
 
-5.   Build the system
+5.   Build the system:
 
         % make
 
@@ -64,25 +71,25 @@ Making and Installing the OpenLDAP Distribution
      may want to consult the Platform Hints subsection of the FAQ if
      you have not done so already.
 
-6.   Test the standalone system
+6.   Test the standalone system:
 
-     This step requires the standalone LDAP server, slapd(8), with
-     BDB and/or LDBM support.
+     This step requires the standalone LDAP server, slapd(8), with HDB
+     and/or BDB support.
 
         % make test
 
      If all goes well, the system has been built as configured.  If
-     not, return to step 4 after reviewing your configuration
+     not, return to step 2 after reviewing your configuration
      settings.  You may want to consult the Installation section of
      the FAQ if you have not done so already.
 
-7.   install the binaries and man pages.  You may need to be come the
-     super-user (e.g. root) to do this (depending on where you are
-     installing things):
+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):
 
         % su root -c 'make install'
 
-8.   That's it!
+8.   That's it.  Enjoy!
 
 See the OpenLDAP Administrator's Guide and the manual pages for the
 individual applications for configuration and use information. You may
@@ -94,13 +101,14 @@ configuration directory (normally /usr/local/etc/openldap).
         slapd.conf              Standalone LDAP daemon
         schema/*.schema         Schema Definitions
 
-End of OpenLDAP INSTALL file.
-
+---
 $OpenLDAP: pkg/openldap-guide/release/install.sdf,v 1.16 2002/02/18
 17:09:26 kurt Exp $
 
-Copyright 1998-2003 The OpenLDAP Foundation, Redwood City,
-	California, USA.  All rights reserved.
+This work is part of OpenLDAP Software <http://www.openldap.org/>.
+
+Copyright 1998-2012 The OpenLDAP Foundation.
+All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted only as authorized by the OpenLDAP