diff options
| author | Andrew Stitcher <astitcher@apache.org> | 2013-06-26 22:41:36 +0000 |
|---|---|---|
| committer | Andrew Stitcher <astitcher@apache.org> | 2013-06-26 22:41:36 +0000 |
| commit | 344f087aca5f1ddaf56a5f1f7ee7aa152aafe60e (patch) | |
| tree | b358f97a230f439a43d246306d4478c84960405b /cpp/BuildInstallSettings.cmake | |
| parent | d6a9f2d58ee595ea65aec20cd7d5efc81ce07487 (diff) | |
| download | qpid-python-344f087aca5f1ddaf56a5f1f7ee7aa152aafe60e.tar.gz | |
QPID-4955: CMake install puts config files in the wrong place
- Also removed ability to specify daemon and client config file
locations individually as that isn't straightforwardly possible
with the CMake install capability.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1497148 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/BuildInstallSettings.cmake')
| -rw-r--r-- | cpp/BuildInstallSettings.cmake | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cpp/BuildInstallSettings.cmake b/cpp/BuildInstallSettings.cmake index b890e186b2..6b8a3afa6c 100644 --- a/cpp/BuildInstallSettings.cmake +++ b/cpp/BuildInstallSettings.cmake @@ -171,7 +171,8 @@ if (UNIX) set (QPID_INSTALL_BINDIR bin) set (QPID_INSTALL_SBINDIR sbin) set (QPID_INSTALL_TESTDIR libexec/qpid/tests) # Directory for test executables - set (QPID_INSTALL_CONFDIR ${SYSCONF_INSTALL_DIR}) + set (QPID_INSTALL_CONFDIR ${SYSCONF_INSTALL_DIR}/qpid) + set (QPID_INSTALL_INITDDIR ${SYSCONF_INSTALL_DIR}/rc.d/init.d) set (QPID_INSTALL_SASLDIR ${SYSCONF_INSTALL_DIR}/sasl2) set (QPID_INSTALL_DATADIR ${SHARE_INSTALL_DIR}/qpid) set (QPID_INSTALL_EXAMPLESDIR ${SHARE_INSTALL_DIR}/qpid/examples) |