X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=INSTALL;h=24a4c6c5d3ca18d3d03457fdc043818fd8896759;hb=6f4d23667e95a585c0df306369ae031a6890618a;hp=c679fe2c68ae325dae2ce380c03d8f1ac8fbf11c;hpb=41f649ef161c00698650fffb80fdec21dc4bb5f1;p=openldap

diff --git a/INSTALL b/INSTALL
index c679fe2c68..24a4c6c5d3 100644
--- a/INSTALL
+++ b/INSTALL
@@ -4,8 +4,12 @@ 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.
 **
+** The OpenLDAP Installation FAQ is available at:
+**    http://www.openldap.org/faq/index.cgi?file=8
+**
 ** You should also check for platform specific hints.
-** These are located in doc/install/hints.
+** These are located in doc/install/hints or:
+**    http://www.openldap.org/faq/index.cgi?file=9
 **
 
 If you want to build binaries for more than one platform from a single
@@ -37,17 +41,13 @@ these steps:
 		CC			C Compiler	(cc, ecgs)
 		CFLAGS		C Flags		(-ansi)
 		CPPFLAGS	CPP Flags	(-I/path/include -Ddef)
-		LDFLAGS		LDFLAGS		(-L/path/lib -llib)
+		LDFLAGS		LDFLAGS		(-L/path/lib)
+		LIBS		LIBS		(-llib)
 
 	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]
 
@@ -55,11 +55,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
 
@@ -69,7 +69,7 @@ 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.
@@ -83,7 +83,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
@@ -97,10 +97,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.
 
@@ -136,7 +141,9 @@ Follow these steps for each different platform:
 CONFIGURE OPTIONS
 
 Regrettably, this section has not been written (yet).  See
-"./configure --help" for current list of options.
+"./configure --help" for current list of options.  For general
+information about how to use "configure", please read:
+	doc/install/configure
 
 
 USING ENVIRONMENT VARIABLES
@@ -145,12 +152,15 @@ The configure script will also use your environmental
 variables for determining compiler/linker options.   This can
 be used to manual specify features and compilation options.
 
+NOTE: If you change environment setting, be sure to remove
+	any config.cache before running ./configure.
+
 Supported Environmental Variables
 	CC			C compiler		(cc, egcc)
 	CFLAGS		C flags			(-ansi)
 	CPPFLAGS	cpp flags		(-I/path/include -Ddef)
-	LDFLAGS		ld flags		(-s)
-	LIBS		libraries		(-L/usr/local/lib -llib)
+	LDFLAGS		ld flags		(-L/usr/local/lib)
+	LIBS		libraries		(-llib)
 	PATH		command path	/usr/local/bin:/usr/bin:/bin
 
 * Including alternative compilers
@@ -164,7 +174,7 @@ Supported Environmental Variables
 	specified compiler.  For example, to require strict
 	ANSI C using the GNU C Compiler, use:
 
-	[env] CC="gcc -ansi -predantic" ./configure
+	[env] CC="gcc -ansi -pedantic" ./configure
 
 	(you can use CFLAGS to specify compiler flags)