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/etc | |
| 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/etc')
| -rw-r--r-- | qpid/cpp/etc/CMakeLists.txt | 12 | ||||
| -rwxr-xr-x | qpid/cpp/etc/qpidd-primary.in | 4 |
2 files changed, 13 insertions, 3 deletions
diff --git a/qpid/cpp/etc/CMakeLists.txt b/qpid/cpp/etc/CMakeLists.txt index 014842c9c7..bca343fbf9 100644 --- a/qpid/cpp/etc/CMakeLists.txt +++ b/qpid/cpp/etc/CMakeLists.txt @@ -17,8 +17,18 @@ # under the License. # +set (sysconfdir ${SYSCONF_INSTALL_DIR}) + +configure_file(qpidd-primary.in + ${CMAKE_CURRENT_BINARY_DIR}/qpidd-primary + @ONLY) + +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/qpidd-primary + DESTINATION ${QPID_INSTALL_CONFDIR}/rc.d/init.d + COMPONENT ${QPID_COMPONENT_BROKER}) + install(FILES qpidc.conf - DESTINATION ${QPID_INSTALL_CONFDIR} + DESTINATION ${QPID_INSTALL_CONFDIR}/qpid COMPONENT ${QPID_COMPONENT_CLIENT}) install(FILES qpidd.conf DESTINATION ${QPID_INSTALL_CONFDIR} diff --git a/qpid/cpp/etc/qpidd-primary.in b/qpid/cpp/etc/qpidd-primary.in index da0c0c2771..fb888227cf 100755 --- a/qpid/cpp/etc/qpidd-primary.in +++ b/qpid/cpp/etc/qpidd-primary.in @@ -40,8 +40,8 @@ prog=qpidd # Source function library. . /etc/rc.d/init.d/functions -if [ -f !!sysconfdir!!/sysconfig/$prog ] ; then - . !!sysconfdir!!/sysconfig/$prog +if [ -f @sysconfdir@/sysconfig/$prog ] ; then + . @sysconfdir@/sysconfig/$prog fi # The following variables can be overridden in !!sysconfdir!!/sysconfig/$prog |