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 | b5cc6625b515510f7f0837285464a67c899c498a (patch) | |
| tree | 6da560ee31e4b8b84a8a81db1a3ccefc3f22d0c0 /cpp | |
| parent | b5f4359c4bca3203ef7571d12ff8f37400882c60 (diff) | |
| download | qpid-python-b5cc6625b515510f7f0837285464a67c899c498a.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/qpid@881172 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/BuildInstallSettings.cmake | 3 | ||||
| -rw-r--r-- | cpp/CMakeLists.txt | 7 |
2 files changed, 1 insertions, 9 deletions
diff --git a/cpp/BuildInstallSettings.cmake b/cpp/BuildInstallSettings.cmake index 6aa5175233..b764f35436 100644 --- a/cpp/BuildInstallSettings.cmake +++ b/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/cpp/CMakeLists.txt b/cpp/CMakeLists.txt index 40646035a0..1c412743fe 100644 --- a/cpp/CMakeLists.txt +++ b/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 |