diff options
| author | Andrew Stitcher <astitcher@apache.org> | 2009-11-17 06:42:52 +0000 |
|---|---|---|
| committer | Andrew Stitcher <astitcher@apache.org> | 2009-11-17 06:42:52 +0000 |
| commit | f18346d7560746123af8dfb5bad14fcd72083483 (patch) | |
| tree | 54a2735f8fa7b47ab1b18ae210a2fa17ac1ad539 | |
| parent | d31480ac081222fed68ebc719f2867405e02ad53 (diff) | |
| download | qpid-python-f18346d7560746123af8dfb5bad14fcd72083483.tar.gz | |
Make the unix config files install in the install prefix not absolute /etc
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@881172 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | qpid/cpp/BuildInstallSettings.cmake | 3 | ||||
| -rw-r--r-- | qpid/cpp/CMakeLists.txt | 7 |
2 files changed, 1 insertions, 9 deletions
diff --git a/qpid/cpp/BuildInstallSettings.cmake b/qpid/cpp/BuildInstallSettings.cmake index 6aa5175233..b764f35436 100644 --- a/qpid/cpp/BuildInstallSettings.cmake +++ b/qpid/cpp/BuildInstallSettings.cmake @@ -109,10 +109,9 @@ if (CMAKE_SYSTEM_NAME STREQUAL Linux) set (CPACK_COMPONENT_DEVELOPMENT_DISPLAY_NAME
"Items required to build new C++ Qpid client programs")
-
set (QPID_INSTALL_BINDIR bin CACHE STRING
"Directory to install user executables")
- set (QPID_INSTALL_CONFDIR /etc/qpid CACHE STRING
+ set (QPID_INSTALL_CONFDIR etc/qpid CACHE STRING
"Directory to install configuration files")
set (QPID_INSTALL_DATADIR share/qpid CACHE STRING
"Directory to install read-only arch.-independent data root")
diff --git a/qpid/cpp/CMakeLists.txt b/qpid/cpp/CMakeLists.txt index 40646035a0..1c412743fe 100644 --- a/qpid/cpp/CMakeLists.txt +++ b/qpid/cpp/CMakeLists.txt @@ -67,13 +67,6 @@ set (CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS " endif (WIN32) -if (CMAKE_SYSTEM_NAME STREQUAL Linux) - # Set up install locations. Since the Linux install puts some files in - # /etc and most in the install location, we need to use a DESTDIR build - # rather than the usual simple use of CPACK_INSTALL_PREFIX. - set (CPACK_SET_DESTDIR ON) -endif (CMAKE_SYSTEM_NAME STREQUAL Linux) - set (QPIDC_CONF_FILE ${QPID_INSTALL_CONFDIR}/qpidc.conf CACHE STRING "Name of the Qpid client configuration file") set (QPIDD_CONF_FILE ${QPID_INSTALL_CONFDIR}/qpidd.conf CACHE STRING |