build: improve systemd service file handling

this solves the issue of having to special case before and after usrmove

Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>
Reviewed-by: Jan Friesse <jfriesse@redhat.com>

diff --git a/configure.ac b/configure.ac
index dc374ca1ab7385fe7e4159bfc1c770abd66dedc7..f2222b2c6d0a24bca7cf55b6bf7111f9b6fe29d9 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -285,6 +285,11 @@ AC_ARG_WITH([initddir],
        [ INITDDIR="$withval" ],
        [ INITDDIR="$sysconfdir/init.d" ])
 
+AC_ARG_WITH([systemddir],
+       [  --with-systemddir=DIR   : path to systemd unit files directory. ],
+       [ SYSTEMDDIR="$withval" ],
+       [ SYSTEMDDIR="/lib/systemd/system" ])
+
 AC_ARG_ENABLE([snmp],
        [  --enable-snmp                   : SNMP protocol support ],
        [ default="no" ])
@@ -579,6 +584,7 @@ LDFLAGS="$ENV_LDFLAGS $COVERAGE_LDFLAGS $OS_LDFLAGS"
 
 # substitute what we need:
 AC_SUBST([INITDDIR])
+AC_SUBST([SYSTEMDDIR])
 
 AC_SUBST([SOMAJOR])
 AC_SUBST([SOMINOR])

diff --git a/corosync.spec.in b/corosync.spec.in
index 0be792127517797c5a0fc0dd886206e963138a2a..406235126ffde233ab66734058ff208a31487ab4 100644 (file)
--- a/corosync.spec.in
+++ b/corosync.spec.in
@@ -97,7 +97,8 @@ export rdmacm_LIBS=-lrdmacm \
 %if %{with xmlconf}
        --enable-xmlconf \
 %endif
-       --with-initddir=%{_initrddir}
+       --with-initddir=%{_initrddir} \
+       --with-systemddir=%{_unitdir}
 
 make %{_smp_mflags}
 

diff --git a/init/Makefile.am b/init/Makefile.am
index 90d49c4dde9c11a9587225bbb742fb0a17dc9ba0..00d56d41ff1f2b66557bc4592115725dfa63f9bf 100644 (file)
--- a/init/Makefile.am
+++ b/init/Makefile.am
@@ -37,7 +37,7 @@ MAINTAINERCLEANFILES  = Makefile.in
 EXTRA_DIST             = generic.in notifyd.in corosync.service.in corosync-notifyd.service.in
 
 if INSTALL_SYSTEMD
-systemdconfdir = /lib/systemd/system
+systemdconfdir = $(SYSTEMDDIR)
 systemdconf_DATA = corosync.service corosync-notifyd.service
 else
 target_INIT            = generic notifyd