X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=INSTALL;h=8f3685d0857610aeeb8a3b74c2e49ee2f53b732b;hb=d129f71b40f1d5cd60975dc5e9f45c4c497e2fd4;hp=5466685abf457f26ffbbb5d1f12d5f45ed7ba020;hpb=82b94e2258a4ee7dbd21155418b34f0596c18611;p=openldap

diff --git a/INSTALL b/INSTALL
index 5466685abf..8f3685d085 100644
--- a/INSTALL
+++ b/INSTALL
@@ -4,8 +4,16 @@ Making and Installing the OpenLDAP Distribution
 ** It is recommended that you read or at least skim through ALL of the
 ** instructions in this file before attempting to build the software.
 **
-** You should also check for platform specific hints.
-** These are located in doc/install/hints.
+** A Quick Start Guide, which may be used in conjunction with this
+** document, is available at:
+**    http://www.openldap.org/faq/index.cgi?file=172
+**
+** The OpenLDAP Installation FAQ is available at:
+**    http://www.openldap.org/faq/index.cgi?file=8
+**
+** You should also check for platform specific hints located on
+** on our web site.
+**    http://www.openldap.org/faq/index.cgi?file=9
 **
 
 If you want to build binaries for more than one platform from a single
@@ -18,9 +26,10 @@ these steps:
  1. untar the distribution and cd to the top:
 
 	% tar xfz openldap-VERSION.tgz
-	% cd ldap
+	% cd openldap-VERSION
 
-    If you are reading this file, you probably have already done this!
+	replacing VERSION to match the version you downloaded.  If you are
+	reading this file, you probably have already done this!
 
  2. Type:
 	% ./configure --help
@@ -43,12 +52,7 @@ these steps:
 	See the 'USING ENVIRONMENT VARIABLES' section for information
 	on how to use the variables. 
 
- 3. edit the file include/ldapconfig.h.edit to configure
-    the software for your site (the files are well-commented):
-
-	% vi include/ldapconfig.h.edit
-
- 4. Configure the build system
+ 3. Configure the build system
 
 	% [env settings] ./configure [options]
 
@@ -56,11 +60,11 @@ these steps:
 	appropriate settings.  Use configure enable/with options and/or
 	environment variables to obtain desired results.
 
- 5. Build dependencies
+ 4. Build dependencies
 
 	% make depend
 
- 6. Build the system
+ 5. Build the system
 
 	% make
 
@@ -70,13 +74,13 @@ these steps:
 	You may want to consult the doc/install/hints file for your
 	platform.
 
- 7. Test the standalone system
+ 6. Test the standalone system
 
 	This step requires the standalone LDAP server (slapd) with
 	LDBM support.
 
 	% cd tests
-	% make
+	% make test
 
 	If all goes well, the system has been built as configured.  If not,
 	return to step 4 after reviewing your configuration settings.
@@ -84,7 +88,7 @@ these steps:
 	You may want to consult the doc/install/hints file for your
 	platform.
 
- 8. install the binaries and man pages.  You may need to be superuser to
+ 7. install the binaries and man pages.  You may need to be superuser to
     do this (depending on where you are installing things):
 
 	% su
@@ -98,10 +102,15 @@ these steps:
 	These configuration files are located in the OpenLDAP
 	configuration directory (normally /usr/local/etc/openldap).
 
-	ldap.conf            - LDAP defaults
-	ldapfilter.conf      - search filter configuration
-	ldapsearchprefs.conf - search object definitions
-	ldaptemplates.conf   - display template definitions
+	Client configuration files:
+	  ldap.conf            - client defaults
+	  ldapfilter.conf      - search filter configuration
+	  ldapsearchprefs.conf - search object definitions
+	  ldaptemplates.conf   - display template definitions
+
+	Server configuration files:
+	  ldapd.conf           - LDAP - X.500 daemon
+	  slapd.conf           - Standalone LDAP daemon
 
     There are section 5 man pages for all of these files.
 
@@ -161,10 +170,11 @@ Supported Environmental Variables
 
 * Including alternative compilers
 	Use the CC environment variable to tell configure to
-	use a specific compiler.  For example, to use ecgs
-	instead of the compiler configure choose, use:
+	use a specific compiler.  For example, to use GNU
+	C Compiler instead of the compiler configure choose,
+	use:
 
-	[env] CC=egcc ./configure 
+	[env] CC=gcc ./configure 
 
 	You can also use CC use specific flags with the
 	specified compiler.  For example, to require strict