From 1a5d192fc53d11320847bb13e52b2be5f28d88fc Mon Sep 17 00:00:00 2001 From: alexhudson Date: Wed, 9 Sep 2009 20:40:31 +0000 Subject: [PATCH] Another attempt to fix our lib naming issues. --- cmake/Directories.cmake | 1 + config.h.cmake | 1 + src/libs/msgapi/msgapi.c | 2 +- src/libs/msgapi/msgauth.c | 2 +- 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/cmake/Directories.cmake b/cmake/Directories.cmake index 9554750..53291dc 100644 --- a/cmake/Directories.cmake +++ b/cmake/Directories.cmake @@ -24,6 +24,7 @@ set(XPL_DEFAULT_DATA_DIR ${CMAKE_INSTALL_PREFIX}/share/bongo) set(XPL_DEFAULT_STATE_DIR ${CMAKE_INSTALL_PREFIX}/var/bongo) set(XPL_DEFAULT_BIN_DIR ${CMAKE_INSTALL_PREFIX}/sbin) +set(XPL_DEFAULT_LIB_DIR ${CMAKE_INSTALL_PREFIX}/${LIB_DIR_NAME}) set(XPL_DEFAULT_CONF_DIR ${CMAKE_INSTALL_PREFIX}/etc/bongo) set(XPL_DEFAULT_NLS_DIR ${CMAKE_INSTALL_PREFIX}/share/bongo/nls) diff --git a/config.h.cmake b/config.h.cmake index 8225d32..1bd00dd 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -47,6 +47,7 @@ #cmakedefine XPL_DEFAULT_STATE_DIR "@XPL_DEFAULT_STATE_DIR@" #cmakedefine XPL_DEFAULT_BIN_DIR "@XPL_DEFAULT_BIN_DIR@" +#cmakedefine XPL_DEFAULT_LIB_DIR "@XPL_DEFAULT_LIB_DIR@" #cmakedefine XPL_DEFAULT_CONF_DIR "@XPL_DEFAULT_CONF_DIR@" #cmakedefine XPL_DEFAULT_NLS_DIR "@XPL_DEFAULT_NLS_DIR@" diff --git a/src/libs/msgapi/msgapi.c b/src/libs/msgapi/msgapi.c index dc522e4..3e70d25 100644 --- a/src/libs/msgapi/msgapi.c +++ b/src/libs/msgapi/msgapi.c @@ -274,7 +274,7 @@ MsgGetDir(MsgApiDirectory directory, char *buffer, size_t buffer_size) path = XPL_DEFAULT_DBF_DIR; break; case MSGAPI_DIR_LIB: - path = LIBDIR; + path = XPL_DEFAULT_LIB_DIR; break; case MSGAPI_DIR_MAIL: path = XPL_DEFAULT_MAIL_DIR; diff --git a/src/libs/msgapi/msgauth.c b/src/libs/msgapi/msgauth.c index 35d5843..8427967 100644 --- a/src/libs/msgapi/msgauth.c +++ b/src/libs/msgapi/msgauth.c @@ -27,7 +27,7 @@ MsgAuthLoadBackend(const char *name, const char *file) AuthPlugin_Init *init_func; MsgAuthAPIFunction *func; - snprintf(path, XPL_MAX_PATH, "%s/bongo-auth/%s", LIBDIR, file); + snprintf(path, XPL_MAX_PATH, "%s/bongo-auth/%s", XPL_DEFAULT_LIB_DIR, file); auth = XplLoadDLL(path); if (! auth) { Log(LOG_FATAL, "Unable to load auth backend '%s'", file);