Working include directory!

configure.in

@@ -322,15 +322,6 @@ AC_REPLACE_FUNCS(strdup)
 # Check Configuration
 CF_SYS_ERRLIST
 
-dnl need do this early
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-dnl append /ldap to $sysconfdir, probably should make this a settable option.
-sysconfdir="$sysconfdir/ldap"
-SYSCONFDIR=`eval echo $sysconfdir`
-AC_SUBST(SYSCONFDIR)
-
 dnl AC_OUTPUT( \
 dnl clients/Makefile:build/top.mk:clients/Makefile.in:build/dir.mk \
 dnl clients/tools/Makefile:build/top.mk:clients/tools/Makefile.in:build/rules.mk \
@@ -343,7 +334,6 @@ dnl clients/rcpt500/Makefile:build/top.mk:clients/rcpt500/Makefile.in:build/rule
 dnl contrib/Makefile:build/top.mk:contrib/Makefile.in:build/dir.mk \
 dnl contrib/saucer/Makefile:build/top.mk:contrib/saucer/Makefile.in:build/rules.mk \
 dnl contrib/whois++/Makefile:build/top.mk:contrib/whois++/Makefile.in:build/rules.mk \
-dnl libraries/Makefile:build/top.mk:libraries/Makefile.in:build/dir.mk 	\
 dnl libraries/libavl/Makefile:build/top.mk:libraries/libavl/Makefile.in:build/lib.mk \
 dnl libraries/liblber/Makefile:build/top.mk:libraries/liblber/Makefile.in:build/lib.mk \
 dnl libraries/libldap/Makefile:build/top.mk:libraries/libldap/Makefile.in:build/lib.mk \
@@ -364,7 +354,7 @@ dnl Makefile:build/top.mk:Makefile.in:build/dir.mk, \
 dnl [date > stamp-h])
 
 AC_OUTPUT( \
-include/ldapconfig.h \
 include/Makefile:build/top.mk:include/Makefile.in \
+libraries/Makefile:build/top.mk:libraries/Makefile.in:build/dir.mk 	\
 Makefile:build/top.mk:Makefile.in:build/dir.mk \
 ,[date > stamp-h])

include/Makefile.in

@@ -11,8 +11,29 @@ install: all FORCE
 		$(INSTALL) $(INSTALLFLAGS) -m 644 disptmpl.h $(includedir)
 		$(INSTALL) $(INSTALLFLAGS) -m 644 srchpref.h $(includedir)
 
-all: FORCE
+all: ldapconfig.h FORCE
+
 clean: FORCE 
 veryclean: FORCE
 depend: FORCE
 
+ldapconfig.h: ldapconfig.h.edit Makefile
+	@$(RM) $@
+	@echo "/*" > $@;  \
+        echo " * This file was automatically generated.  Do not edit it." >> $@; \
+        echo " * Instead, edit the file ldapconfig.h.edit.  See the LDAP" >> $@; \
+        echo " * INSTALL file for more information." >> $@; \
+        echo " */ " >> $@; \
+        echo "" >> $@; \
+	$(SED) \
+			-e 's;%SYSCONFDIR%;$(sysconfdir);' \
+			-e 's;%BINDIR%;$(bindir);' \
+			-e 's;%SBINDIR%;$(sbindir);' \
+			-e 's;%LIBEXECDIR%;$(libexecdir);' \
+			-e 's;%RUNDIR%;$(localstatedir);' \
+			-e 's;%EDITOR%;$(EDITOR);' \
+			-e 's;%FINGER%;$(FINGER);' \
+			-e 's;%SENDMAIL%;$(SENDMAIL);' \
+			 ldapconfig.h.edit >> $@; \
+	$(CHMOD) 444 $@
+

include/ldapconfig.h.edit

@@ -24,26 +24,26 @@
  */
 #define DEFAULT_BINDIR		"%BINDIR%"
 #define DEFAULT_SBINDIR		"%SBINDIR%"
-#define DEFAULT_ETCDIR		"%ETCDIR%"
+#define DEFAULT_SYSCONFDIR	"%SYSCONFDIR%"
 #define DEFAULT_LIBEXECDIR	"%LIBEXECDIR%"
 
 /* default ldap host */
 #define LDAPHOST	"localhost"
 
-#define DEFAULT_LDAPHOST_FILE "%ETCDIR%/ldaphost"
+#define DEFAULT_LDAPHOST_FILE "%SYSCONFDIR%/ldaphost"
 /* default place to start searching */
 #define DEFAULT_BASE	"o=Your Organization Name, c=US"
-#define DEFAULT_BASE_FILE "%ETCDIR%/ldapbase"
+#define DEFAULT_BASE_FILE "%SYSCONFDIR%/ldapbase"
 
 /*
  * default binddn and creditials
  *  use files, make sure they are not generally readable
  */
 #define DEFAULT_BINDDN		NULL
-#define DEFAULT_BINDDN_FILE "%ETCDIR%/ldapbinddn"
+#define DEFAULT_BINDDN_FILE "%SYSCONFDIR%/ldapbinddn"
 
 #define DEFAULT_BIND_CRED	NULL
-#define DEFAULT_BIND_CRED_FILE "%ETCDIR%/ldapbindcred"
+#define DEFAULT_BIND_CRED_FILE "%SYSCONFDIR%/ldapbindcred"
 
 /*********************************************************************
  *                                                                   *
@@ -59,10 +59,10 @@
 	/* default count of DN components to show in entry displays */
 #define DEFAULT_RDNCOUNT	2
 	/* default config file locations */
-#define FILTERFILE	"%ETCDIR%/ldapfilter.conf"
-#define TEMPLATEFILE	"%ETCDIR%/ldaptemplates.conf"
-#define SEARCHFILE	"%ETCDIR%/ldapsearchprefs.conf"
-#define FRIENDLYFILE	"%ETCDIR%/ldapfriendly"
+#define FILTERFILE	"%SYSCONFDIR%/ldapfilter.conf"
+#define TEMPLATEFILE	"%SYSCONFDIR%/ldaptemplates.conf"
+#define SEARCHFILE	"%SYSCONFDIR%/ldapsearchprefs.conf"
+#define FRIENDLYFILE	"%SYSCONFDIR%/ldapfriendly"
 
 /*
  * FINGER DEFINITIONS
@@ -136,7 +136,7 @@ Please try again later.\r\n"
 #define GO500GW_BINDDN			NULL
 #define GO500GW_BIND_CRED		NULL
 	/* where the helpfile lives */
-#define GO500GW_HELPFILE	"%ETCDIR%/go500gw.help"
+#define GO500GW_HELPFILE	"%SYSCONFDIR%/go500gw.help"
 	/* port on which to listen */
 #define GO500GW_PORT		7777
 	/* timeout on all searches */
@@ -160,7 +160,7 @@ Please try again later.\r\n"
 #define RCPT500_BINDDN		NULL
 #define RCPT500_BIND_CRED	NULL
 	/* where the helpfile lives */
-#define RCPT500_HELPFILE	"%ETCDIR%/rcpt500.help"
+#define RCPT500_HELPFILE	"%SYSCONFDIR%/rcpt500.help"
 	/* maximum number of matches returned */
 #define RCPT500_SIZELIMIT	50
 	/* address replies will appear to come from */
@@ -234,7 +234,7 @@ Please try again later.\r\n"
  * UD DEFINITIONS
  */
 	/* ud configuration file */
-#define UD_CONFIG_FILE		"%ETCDIR%/ud.conf"
+#define UD_CONFIG_FILE		"%SYSCONFDIR%/ud.conf"
 	/* default editor */
 #define UD_DEFAULT_EDITOR	"%EDITOR%"
 	/* default bbasename of user config file */
@@ -283,7 +283,7 @@ Please try again later.\r\n"
  * SLAPD DEFINITIONS
  */
 	/* location of the default slapd config file */
-#define SLAPD_DEFAULT_CONFIGFILE	"%ETCDIR%/slapd.conf"
+#define SLAPD_DEFAULT_CONFIGFILE	"%SYSCONFDIR%/slapd.conf"
 	/* default sizelimit on number of entries from a search */
 #define SLAPD_DEFAULT_SIZELIMIT		500
 	/* default timelimit to spend on a search */