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/qpid@1465643 13f79535-47bb-0310-9956-ffa450edef68

5 files changed, 27 insertions, 10 deletions

diff --git a/cpp/BuildInstallSettings.cmake b/cpp/BuildInstallSettings.cmake
index affc3bbe11..59b59a4855 100644
--- a/cpp/BuildInstallSettings.cmake
+++ b/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
diff --git a/cpp/etc/CMakeLists.txt b/cpp/etc/CMakeLists.txt
index 014842c9c7..bca343fbf9 100644
--- a/cpp/etc/CMakeLists.txt
+++ b/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/cpp/etc/qpidd-primary.in b/cpp/etc/qpidd-primary.in
index da0c0c2771..fb888227cf 100755
--- a/cpp/etc/qpidd-primary.in
+++ b/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
diff --git a/cpp/managementgen/CMakeLists.txt b/cpp/managementgen/CMakeLists.txt
index 2511b745a3..aad3b7f4a7 100644
--- a/cpp/managementgen/CMakeLists.txt
+++ b/cpp/managementgen/CMakeLists.txt
@@ -19,8 +19,15 @@
 project(qpidc-qmfgen)
 cmake_minimum_required(VERSION 2.4.0 FATAL_ERROR)
 
-install(PROGRAMS qmf-gen DESTINATION managementgen
+find_package(PythonInterp 2.7 REQUIRED)
+
+execute_process(COMMAND ${PYTHON_EXECUTABLE}
+                -c "from distutils.sysconfig import get_python_lib; print get_python_lib(False)"
+                OUTPUT_VARIABLE PYTHON_SITEARCH_PACKAGES
+                OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+install(PROGRAMS qmf-gen DESTINATION ${QPID_INSTALL_BINDIR}
         COMPONENT ${QPID_COMPONENT_QMF})
-install(DIRECTORY qmfgen DESTINATION managementgen
+install(DIRECTORY qmfgen DESTINATION ${PYTHON_SITEARCH_PACKAGES}/qmfgen
         COMPONENT ${QPID_COMPONENT_QMF}
         PATTERN ".svn" EXCLUDE PATTERN "*.pyc" EXCLUDE)
diff --git a/cpp/src/CMakeLists.txt b/cpp/src/CMakeLists.txt
index 30ee80469a..f3d7f5eed0 100644
--- a/cpp/src/CMakeLists.txt
+++ b/cpp/src/CMakeLists.txt
@@ -1272,8 +1272,8 @@ if (CPACK_GENERATOR STREQUAL "NSIS")
 endif (CPACK_GENERATOR STREQUAL "NSIS")
 
 if (UNIX)
-  install (CODE "FILE(MAKE_DIRECTORY \$ENV{DESTDIR}${QPID_LOCALSTATE_DIR}/lib/qpidd)")
-  install (CODE "FILE(MAKE_DIRECTORY \$ENV{DESTDIR}${QPID_LOCALSTATE_DIR}/spool/qpidd)")
+  install (CODE "FILE(MAKE_DIRECTORY \$ENV{DESTDIR}/${QPID_LOCALSTATE_DIR}/lib/qpidd)")
+  install (CODE "FILE(MAKE_DIRECTORY \$ENV{DESTDIR}/${QPID_LOCALSTATE_DIR}/spool/qpidd)")
 endif (UNIX)
 
 set (qmf_SOURCES