You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by tr...@apache.org on 2013/12/23 17:15:04 UTC
svn commit: r1553138 - in /qpid/dispatch/trunk: CMakeLists.txt
router/CMakeLists.txt
Author: tross
Date: Mon Dec 23 16:15:03 2013
New Revision: 1553138
URL: http://svn.apache.org/r1553138
Log:
QPID-5436 - Applied patch from Darryl Pierce
Modified:
qpid/dispatch/trunk/CMakeLists.txt
qpid/dispatch/trunk/router/CMakeLists.txt
Modified: qpid/dispatch/trunk/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/CMakeLists.txt?rev=1553138&r1=1553137&r2=1553138&view=diff
==============================================================================
--- qpid/dispatch/trunk/CMakeLists.txt (original)
+++ qpid/dispatch/trunk/CMakeLists.txt Mon Dec 23 16:15:03 2013
@@ -50,14 +50,22 @@ endif()
set(INCLUDE_INSTALL_DIR include CACHE PATH "Include file directory")
set(QPID_DISPATCH_HOME "lib/qpid-dispatch" CACHE PATH "Private Dispatch library directory")
set(LIB_INSTALL_DIR "lib${LIB_SUFFIX}" CACHE PATH "Library object file directory")
-set(SYSCONF_INSTALL_DIR etc CACHE PATH "System read only configuration directory")
set(SHARE_INSTALL_DIR share CACHE PATH "Shared read only data directory")
set(DOC_INSTALL_DIR ${SHARE_INSTALL_DIR}/doc CACHE PATH "Shared read-only data directory")
set(MAN_INSTALL_DIR share/man CACHE PATH "Manpage directory")
set(QPID_DISPATCH_HOME_INSTALLED ${CMAKE_INSTALL_PREFIX}/${QPID_DISPATCH_HOME})
-## Set SYSCONF_INSTALL_PREFIX to "" for RPM-based installs
-set(SYSCONF_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX} CACHE PATH "Install prefix for system configuration files")
+# define the configuration directory based on whether or not the install prefix is defined
+if(NOT DEFINED SYSCONF_INSTALL_DIR)
+ if(CMAKE_INSTALL_PREFIX STREQUAL "/usr")
+ set(SYSCONF_INSTALL_DIR "/etc")
+ else()
+ set(SYSCONF_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/etc")
+ endif()
+endif()
+
+set(QPID_DISPATCH_CONFDIR ${SYSCONF_INSTALL_DIR}/qpid-dispatch)
+message(STATUS "QPID_DISPATCH_CONFDIR=${QPID_DISPATCH_CONFDIR}")
##
## Find dependencies
@@ -132,7 +140,7 @@ install(TARGETS qpid-dispatch
file(GLOB headers "include/qpid/dispatch/*.h")
install(FILES ${headers} DESTINATION ${INCLUDE_INSTALL_DIR}/qpid/dispatch)
install(FILES include/qpid/dispatch.h DESTINATION ${INCLUDE_INSTALL_DIR}/qpid)
-install(FILES etc/qdrouterd.conf DESTINATION ${SYSCONF_INSTALL_PREFIX}/${SYSCONF_INSTALL_DIR}/qpid-dispatch)
+install(FILES etc/qdrouterd.conf DESTINATION ${SYSCONF_INSTALL_DIR}/qpid-dispatch)
##
## Python modules installation
Modified: qpid/dispatch/trunk/router/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/router/CMakeLists.txt?rev=1553138&r1=1553137&r2=1553138&view=diff
==============================================================================
--- qpid/dispatch/trunk/router/CMakeLists.txt (original)
+++ qpid/dispatch/trunk/router/CMakeLists.txt Mon Dec 23 16:15:03 2013
@@ -18,7 +18,7 @@
##
-set(DEFAULT_CONFIG_PATH "${SYSCONF_INSTALL_PREFIX}/${SYSCONF_INSTALL_DIR}/qpid-dispatch/qdrouterd.conf" CACHE string "Default config file path")
+set(DEFAULT_CONFIG_PATH "${QPID_DISPATCH_CONFDIR}/qdrouterd.conf" CACHE string "Default config file path")
set(DEFAULT_DISPATCH_PYTHON_DIR ${QPID_DISPATCH_PYTHON_DIR})
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org