diff options
| author | Darryl L. Pierce <mcpierce@apache.org> | 2012-11-28 13:23:59 +0000 |
|---|---|---|
| committer | Darryl L. Pierce <mcpierce@apache.org> | 2012-11-28 13:23:59 +0000 |
| commit | f4d040e7fca83c5e0184fc5e137fc1e5658d04c7 (patch) | |
| tree | ea1fb6446d2e890454e7d6c3d8c8ac94a2f31075 /qpid/cpp | |
| parent | 3f3672469e46b6f6ac86e59f8537bf9dc9e4ecc4 (diff) | |
| download | qpid-python-f4d040e7fca83c5e0184fc5e137fc1e5658d04c7.tar.gz | |
NO-JIRA: Made the Systemd install directory macro consistent with others.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1414666 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp')
| -rw-r--r-- | qpid/cpp/BuildInstallSettings.cmake | 2 | ||||
| -rw-r--r-- | qpid/cpp/etc/CMakeLists.txt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/qpid/cpp/BuildInstallSettings.cmake b/qpid/cpp/BuildInstallSettings.cmake index f2b1fca188..dfa88022d9 100644 --- a/qpid/cpp/BuildInstallSettings.cmake +++ b/qpid/cpp/BuildInstallSettings.cmake @@ -180,7 +180,7 @@ endif() 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 (QPIDD_INSTALL_SYSTEMDDIR usr/lib/systemd/system) # Systemd service 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 set_absolute_install_path (QPIDD_MODULE_DIR ${QPID_INSTALL_LIBDIR}/qpid/daemon) # Directory to load broker plug-in modules from diff --git a/qpid/cpp/etc/CMakeLists.txt b/qpid/cpp/etc/CMakeLists.txt index e86f2094d9..de808d2808 100644 --- a/qpid/cpp/etc/CMakeLists.txt +++ b/qpid/cpp/etc/CMakeLists.txt @@ -24,7 +24,7 @@ install(FILES qpidd.conf DESTINATION ${QPID_INSTALL_CONFDIR} COMPONENT ${QPID_COMPONENT_BROKER}) install(FILES qpidd.service - DESTINATION ${QPIDD_INSTALL_SYSTEMDDIR} + DESTINATION ${QPID_INSTALL_SYSTEMDDIR} COMPONENT ${QPID_COMPONENT_BROKER}) if (BUILD_SASL) install(FILES sasl2/qpidd.conf |