diff options
| author | Darryl L. Pierce <mcpierce@apache.org> | 2012-11-27 20:38:41 +0000 |
|---|---|---|
| committer | Darryl L. Pierce <mcpierce@apache.org> | 2012-11-27 20:38:41 +0000 |
| commit | 3f3672469e46b6f6ac86e59f8537bf9dc9e4ecc4 (patch) | |
| tree | 947216e483909462cfd112867bd908b4cec61a74 /qpid/cpp/etc/Makefile.am | |
| parent | b2da79bd6a02f9584ea9ae1ab00812fdcab3853b (diff) | |
| download | qpid-python-3f3672469e46b6f6ac86e59f8537bf9dc9e4ecc4.tar.gz | |
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@1414392 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/etc/Makefile.am')
| -rw-r--r-- | qpid/cpp/etc/Makefile.am | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/qpid/cpp/etc/Makefile.am b/qpid/cpp/etc/Makefile.am index 7af495f089..cee4e2d52d 100644 --- a/qpid/cpp/etc/Makefile.am +++ b/qpid/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 |