re-fix ITS#4936

This commit is contained in:
Pierangelo Masarati 2007-06-10 21:55:39 +00:00
parent 25a7729a12
commit af985c7efb
3 changed files with 8 additions and 1 deletions

View File

@ -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) >> $@; \

View File

@ -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

View File

@ -69,7 +69,7 @@ int module_init (void)
return -1;
}
return module_path( LDAP_LIBEXECDIR );
return module_path( LDAP_MODULEDIR );
}
int module_kill (void)