From: Pierangelo Masarati <ando@openldap.org>
Date: Sun, 10 Jun 2007 21:55:39 +0000 (+0000)
Subject: re-fix ITS#4936
X-Git-Tag: OPENLDAP_REL_ENG_2_4_MP~397
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=af985c7efb1069ae1062d991b6b9fc90acb47747;p=openldap

re-fix ITS#4936
---

diff --git a/include/Makefile.in b/include/Makefile.in
index cd25dca8ab..794769baf2 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -50,6 +50,8 @@ ldap_config.h: $(LDAP_CONFIG) Makefile
 		$(SED) -e 's/\\\\/\\\\\\\\\\\\\\\\/g'`; \
 	    libexecdir=`cygpath -w $(libexecdir) | \
 		$(SED) -e 's/\\\\/\\\\\\\\\\\\\\\\/g'`; \
+	    moduledir=`cygpath -w $(moduledir) | \
+		$(SED) -e 's/\\\\/\\\\\\\\\\\\\\\\/g'`; \
 	    localstatedir=`cygpath -w $(localstatedir) | \
 		$(SED) -e 's/\\\\/\\\\\\\\\\\\\\\\/g'`; \
 	else \
@@ -58,6 +60,7 @@ ldap_config.h: $(LDAP_CONFIG) Makefile
 	    bindir=$(bindir); \
 	    sbindir=$(sbindir); \
 	    libexecdir=$(libexecdir); \
+	    moduledir=$(moduledir); \
 	    localstatedir=$(localstatedir); \
 	    localedir=$(localedir); \
 	fi; \
@@ -67,6 +70,7 @@ ldap_config.h: $(LDAP_CONFIG) Makefile
 			-e "s;%BINDIR%;$$bindir;" \
 			-e "s;%SBINDIR%;$$sbindir;" \
 			-e "s;%LIBEXECDIR%;$$libexecdir;" \
+			-e "s;%MODULEDIR%;$$moduledir;" \
 			-e "s;%RUNDIR%;$$localstatedir;" \
 			-e "s;%LOCALEDIR%;$$localedir;" \
 			 $(LDAP_CONFIG) >> $@; \
diff --git a/include/ldap_config.hin b/include/ldap_config.hin
index 5d8132b7c4..fcd59493ab 100644
--- a/include/ldap_config.hin
+++ b/include/ldap_config.hin
@@ -59,6 +59,9 @@
 #ifndef LDAP_LIBEXECDIR
 #define LDAP_LIBEXECDIR		"%LIBEXECDIR%"
 #endif
+#ifndef LDAP_MODULEDIR
+#define LDAP_MODULEDIR		"%MODULEDIR%"
+#endif
 #ifndef LDAP_RUNDIR
 #define LDAP_RUNDIR			"%RUNDIR%"
 #endif
diff --git a/servers/slapd/module.c b/servers/slapd/module.c
index 65633f88d6..71e1b22200 100644
--- a/servers/slapd/module.c
+++ b/servers/slapd/module.c
@@ -69,7 +69,7 @@ int module_init (void)
 		return -1;
 	}
 
-	return module_path( LDAP_LIBEXECDIR );
+	return module_path( LDAP_MODULEDIR );
 }
 
 int module_kill (void)