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/11 20:18:22 UTC
svn commit: r1550236 - in /qpid/dispatch/trunk: CMakeLists.txt
router/CMakeLists.txt
Author: tross
Date: Wed Dec 11 19:18:22 2013
New Revision: 1550236
URL: http://svn.apache.org/r1550236
Log:
QPID-5380
- Make config path default point to the installed config
- Add a hook (SYSCONF_INSTALL_PREFIX) to allow config to be installed in /etc/ for RPM-installs.
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=1550236&r1=1550235&r2=1550236&view=diff
==============================================================================
--- qpid/dispatch/trunk/CMakeLists.txt (original)
+++ qpid/dispatch/trunk/CMakeLists.txt Wed Dec 11 19:18:22 2013
@@ -56,6 +56,9 @@ set(DOC_INSTALL_DIR ${SHARE_INSTALL_DIR}
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")
+
##
## Find dependencies
##
@@ -134,7 +137,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_DIR}/qpid-dispatch)
+install(FILES etc/qdrouterd.conf DESTINATION ${SYSCONF_INSTALL_PREFIX}/${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=1550236&r1=1550235&r2=1550236&view=diff
==============================================================================
--- qpid/dispatch/trunk/router/CMakeLists.txt (original)
+++ qpid/dispatch/trunk/router/CMakeLists.txt Wed Dec 11 19:18:22 2013
@@ -18,7 +18,7 @@
##
-set(DEFAULT_CONFIG_PATH "/etc/qpid-dispatch/qdrouterd.conf" CACHE string "Default config file path")
+set(DEFAULT_CONFIG_PATH "${SYSCONF_INSTALL_PREFIX}/${SYSCONF_INSTALL_DIR}/qpid-dispatch/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