geos_one/bongo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Attempt to work out the correct library locations more generally.

Browse Source
This commit is contained in:
alexhudson
2009-09-09 09:27:47 +00:00
parent 1819bc99e9
commit 22f7058bfa
4 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmake/Directories.cmake
+10 -2
View File
@@ -1,9 +1,18 @@
# various directory definitions we use throughout Bongo
if(EXISTS /lib64)
set(_LIB_DIR_NAME lib64)
else(EXISTS /lib64)
set(_LIB_DIR_NAME lib)
endif(EXISTS /lib64)
set(LIB_DIR_NAME ${_LIB_DIR_NAME} CACHE PATH
"Name of library location (arch-specific), usually 'lib' or 'lib64'")
# 'default' locations for where objects get built
set(BINDIR ${PROJECT_BINARY_DIR}/bin)
set(SBINDIR ${PROJECT_BINARY_DIR}/sbin)
set(LIBDIR ${LIBRARY_OUTPUT_PATH})
set(LIBDIR ${PROJECT_BINARY_DIR}/${LIB_DIR_NAME})
set(LIBEXECDIR ${PROJECT_BINARY_DIR}/libexec)
set(DATAROOTDIR ${PROJECT_BINARY_DIR}/share)
set(DATADIR ${PROJECT_BINARY_DIR}/share)
@@ -15,7 +24,6 @@ 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)
set(XPL_DEFAULT_CONF_DIR ${CMAKE_INSTALL_PREFIX}/etc/bongo)
set(XPL_DEFAULT_NLS_DIR ${CMAKE_INSTALL_PREFIX}/share/bongo/nls)
config.h.cmake
-1
View File
@@ -47,7 +47,6 @@
#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@"
src/libs/msgapi/msgapi.c
+1 -1
View File
@@ -274,7 +274,7 @@ MsgGetDir(MsgApiDirectory directory, char *buffer, size_t buffer_size)
path = XPL_DEFAULT_DBF_DIR;
break;
case MSGAPI_DIR_LIB:
path = XPL_DEFAULT_LIB_DIR;
path = LIBDIR;
break;
case MSGAPI_DIR_MAIL:
path = XPL_DEFAULT_MAIL_DIR;
src/libs/msgapi/msgauth.c
+1 -1
View File
@@ -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", XPL_DEFAULT_LIB_DIR, file);
snprintf(path, XPL_MAX_PATH, "%s/bongo-auth/%s", LIBDIR, file);
auth = XplLoadDLL(path);
if (! auth) {
Log(LOG_FATAL, "Unable to load auth backend '%s'", file);