From 7f1f7f7a01cfcbb892285dc3a7d9372d1fb1ff43 Mon Sep 17 00:00:00 2001
From: "Darryl L. Pierce" <mcpierce@apache.org>
Date: Mon, 8 Apr 2013 14:02:18 +0000
Subject: 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
---
 qpid/cpp/etc/CMakeLists.txt   | 12 +++++++++++-
 qpid/cpp/etc/qpidd-primary.in |  4 ++--
 2 files changed, 13 insertions(+), 3 deletions(-)

(limited to 'qpid/cpp/etc')

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
-- 
cgit v1.2.1