diff options
| author | Darryl L. Pierce <mcpierce@apache.org> | 2013-04-08 14:02:18 +0000 |
|---|---|---|
| committer | Darryl L. Pierce <mcpierce@apache.org> | 2013-04-08 14:02:18 +0000 |
| commit | 7f1f7f7a01cfcbb892285dc3a7d9372d1fb1ff43 (patch) | |
| tree | 11df600a73df01c8a3d074e41b6cbb670a657da7 /qpid/cpp/BuildInstallSettings.cmake | |
| parent | ad56a06e1f1c22a0baccb99c27a64ee9564da83b (diff) | |
| download | qpid-python-7f1f7f7a01cfcbb892285dc3a7d9372d1fb1ff43.tar.gz | |
QPID-4698: Fixed the install location for files under CMake.
Installs the SASL2 qpidd.conf file to /etc/qpid/sasl2/qpidd.conf
Installs qpidd-primary to /etc/rc.d/init.d/qpidd-primary
Installs the qmf-gen Python script to /usr/bin
Installs the managementgen sitepackage to where sitelibs belong
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1465643 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/BuildInstallSettings.cmake')
| -rw-r--r-- | qpid/cpp/BuildInstallSettings.cmake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/qpid/cpp/BuildInstallSettings.cmake b/qpid/cpp/BuildInstallSettings.cmake index affc3bbe11..59b59a4855 100644 --- a/qpid/cpp/BuildInstallSettings.cmake +++ b/qpid/cpp/BuildInstallSettings.cmake @@ -171,15 +171,15 @@ 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}/qpid) - set (QPID_INSTALL_SASLDIR ${SYSCONF_INSTALL_DIR}/sasl2) + set (QPID_INSTALL_CONFDIR ${SYSCONF_INSTALL_DIR}) + set (QPID_INSTALL_SASLDIR ${SYSCONF_INSTALL_DIR}/qpid/sasl2) set (QPID_INSTALL_DATADIR ${SHARE_INSTALL_DIR}/qpid) set (QPID_INSTALL_EXAMPLESDIR ${SHARE_INSTALL_DIR}/examples) set (QPID_INSTALL_DOCDIR ${DOC_INSTALL_DIR}) # Directory to install documentation set (QPID_INSTALL_INCLUDEDIR ${INCLUDE_INSTALL_DIR}) set (QPID_INSTALL_LIBDIR ${LIB_INSTALL_DIR}) set (QPID_LOCALSTATE_DIR var) # Directory to store local state data - set (QPID_MAN_DIR man) # Directory to install manual files + set (QPID_MAN_DIR share/man) # Directory to install manual files set (QPID_INSTALL_SYSTEMDDIR usr/lib/systemd/system) # Systemd service files set_absolute_install_path (QPIDC_MODULE_DIR ${QPID_INSTALL_LIBDIR}/qpid/client) # Directory to load client plug-in modules from |