re-fix ITS#4936

diff --git a/include/Makefile.in b/include/Makefile.in
index cd25dca8ab2cca531cc176c94410a9ca29640769..794769baf2008603fd6db81593f154b1394b460a 100644 (file)
--- 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 5d8132b7c4a0f7c8bd2611220a26a74e9fdc4995..fcd59493abc98ba3f5ecaffcb6156d2445df5780 100644 (file)
--- 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 65633f88d6f358cb317390edcf89e1e983421695..71e1b22200ff62c12c154455787722b29e9b7d79 100644 (file)
--- 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)