From 7313dd0a6cb254c6b1432f42c60f137bea29a0d1 Mon Sep 17 00:00:00 2001
From: "Darryl L. Pierce" <mcpierce@apache.org>
Date: Tue, 27 Nov 2012 20:38:41 +0000
Subject: QPID-4388: Systemd support not being installed with Cmake

Previously systemd support was only in the automake system, and the
qpidd.service file was processed via sed. But, since there are no
substitutions needed in the file, it's now renamed to qpidd.service. And
both Makefile.am and CMakeLists.txt will simply install it to
/usr/lib/systemd/system.

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1414392 13f79535-47bb-0310-9956-ffa450edef68
---
 cpp/BuildInstallSettings.cmake |  1 +
 cpp/etc/CMakeLists.txt         |  3 +++
 cpp/etc/Makefile.am            |  8 ++++----
 cpp/etc/qpidd.service          | 13 +++++++++++++
 cpp/etc/qpidd.service.in       | 13 -------------
 5 files changed, 21 insertions(+), 17 deletions(-)
 create mode 100644 cpp/etc/qpidd.service
 delete mode 100644 cpp/etc/qpidd.service.in

(limited to 'cpp')

diff --git a/cpp/BuildInstallSettings.cmake b/cpp/BuildInstallSettings.cmake
index 23cc24c96c..f2b1fca188 100644
--- a/cpp/BuildInstallSettings.cmake
+++ b/cpp/BuildInstallSettings.cmake
@@ -180,6 +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_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/cpp/etc/CMakeLists.txt b/cpp/etc/CMakeLists.txt
index 014842c9c7..e86f2094d9 100644
--- a/cpp/etc/CMakeLists.txt
+++ b/cpp/etc/CMakeLists.txt
@@ -23,6 +23,9 @@ install(FILES qpidc.conf
 install(FILES qpidd.conf
         DESTINATION ${QPID_INSTALL_CONFDIR}
         COMPONENT ${QPID_COMPONENT_BROKER})
+install(FILES qpidd.service
+        DESTINATION ${QPIDD_INSTALL_SYSTEMDDIR}
+        COMPONENT ${QPID_COMPONENT_BROKER})
 if (BUILD_SASL)
   install(FILES sasl2/qpidd.conf
           DESTINATION ${QPID_INSTALL_SASLDIR}
diff --git a/cpp/etc/Makefile.am b/cpp/etc/Makefile.am
index 7af495f089..cee4e2d52d 100644
--- a/cpp/etc/Makefile.am
+++ b/cpp/etc/Makefile.am
@@ -20,7 +20,7 @@ SASL_CONF = sasl2/qpidd.conf
 
 EXTRA_DIST = \
 	$(SASL_CONF) \
-	qpidd.service.in qpidd.in qpidd-primary.in qpidd.conf qpidc.conf CMakeLists.txt \
+	qpidd.service qpidd.in qpidd-primary.in qpidd.conf qpidc.conf CMakeLists.txt \
 	cluster.conf-example.xml.in
 
 confdir = $(sysconfdir)/qpid
@@ -47,11 +47,11 @@ qpidd-primary: qpidd-primary.in
 	sed $(SUBST) $< > $@
 cluster.conf-example.xml: cluster.conf-example.xml.in
 	sed $(SUBST) $< > $@
-qpidd.service: qpidd.service.in
-	sed $(SUBST) $< > $@
 
 CLEANFILES = qpidd qpidd-primary cluster.conf-example.xml qpidd.service
 
 initddir = $(sysconfdir)/init.d
-nobase_initd_SCRIPTS = qpidd qpidd-primary qpidd.service
+nobase_initd_SCRIPTS = qpidd qpidd-primary
 
+systemddir = /usr/lib/systemd/system
+nobase_systemd_SCRIPTS = qpidd.service
diff --git a/cpp/etc/qpidd.service b/cpp/etc/qpidd.service
new file mode 100644
index 0000000000..a6549834f4
--- /dev/null
+++ b/cpp/etc/qpidd.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=An AMQP message broker daemon.
+Documentation=man:qpidd(1) http://qpid.apache.org/
+Requires=network.target
+
+[Service]
+User=qpidd
+Group=qpidd
+Type=simple
+ExecStart=/usr/sbin/qpidd --config /etc/qpidd.conf
+
+[Install]
+WantedBy=multi-user.target
diff --git a/cpp/etc/qpidd.service.in b/cpp/etc/qpidd.service.in
deleted file mode 100644
index a6549834f4..0000000000
--- a/cpp/etc/qpidd.service.in
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=An AMQP message broker daemon.
-Documentation=man:qpidd(1) http://qpid.apache.org/
-Requires=network.target
-
-[Service]
-User=qpidd
-Group=qpidd
-Type=simple
-ExecStart=/usr/sbin/qpidd --config /etc/qpidd.conf
-
-[Install]
-WantedBy=multi-user.target
-- 
cgit v1.2.1