configure: kill off INITWRAPPERSDIR

When configured for systemd, don't install the SysV init scripts at all.

Signed-off-by: Ferenc Wágner <wferi@debian.org>
Signed-off-by: Jan Friesse <jfriesse@redhat.com>
Reviewed-by: Jan Friesse <jfriesse@redhat.com>

configure.ac

@@ -386,11 +386,6 @@ AC_ARG_WITH([upstartdir],
 	[ UPSTARTDIR="$withval" ],
 	[ UPSTARTDIR="$sysconfdir/init" ])
 
-AC_ARG_WITH([initwrappersdir],
-	[  --with-initwrappersdir=DIR   : path to init wrappers files directory. ],
-	[ INITWRAPPERSDIR="$withval" ],
-	[ INITWRAPPERSDIR="$datarootdir/corosync" ])
-
 AC_ARG_WITH([logdir],
 	[  --with-logdir=DIR       : the base directory for corosync logging files. ],
 	[ LOGDIR="$withval" ],
@@ -729,8 +724,6 @@ AC_SUBST([BASHPATH])
 AC_SUBST([INITDDIR])
 AC_SUBST([SYSTEMDDIR])
 AC_SUBST([UPSTARTDIR])
-INITWRAPPERSDIR=$(eval echo ${INITWRAPPERSDIR})
-AC_SUBST([INITWRAPPERSDIR])
 AC_SUBST([LOGDIR])
 AC_SUBST([LOGROTATEDIR])
 
@@ -774,7 +767,6 @@ AC_MSG_RESULT([  System configuration     = ${sysconfdir}])
 AC_MSG_RESULT([  System init.d directory  = ${INITDDIR}])
 AC_MSG_RESULT([  System systemd directory = ${SYSTEMDDIR}])
 AC_MSG_RESULT([  System upstart directory = ${UPSTARTDIR}])
-AC_MSG_RESULT([  System init wraps dir    = ${INITWRAPPERSDIR}])
 AC_MSG_RESULT([  Log directory            = ${LOGDIR}])
 AC_MSG_RESULT([  Log rotate directory     = ${LOGROTATEDIR}])
 AC_MSG_RESULT([  corosync config dir      = ${COROSYSCONFDIR}])

corosync.spec.in

@@ -249,9 +249,6 @@ fi
 %if %{with systemd}
 %{_unitdir}/corosync.service
 %{_unitdir}/corosync-notifyd.service
-%dir %{_datadir}/corosync
-%{_datadir}/corosync/corosync
-%{_datadir}/corosync/corosync-notifyd
 %else
 %{_initrddir}/corosync
 %{_initrddir}/corosync-notifyd
@@ -430,8 +427,6 @@ fi
 %config(noreplace) %{_sysconfdir}/sysconfig/corosync-qdevice
 %if %{with systemd}
 %{_unitdir}/corosync-qdevice.service
-%dir %{_datadir}/corosync
-%{_datadir}/corosync/corosync-qdevice
 %else
 %{_initrddir}/corosync-qdevice
 %endif
@@ -500,8 +495,6 @@ fi
 %config(noreplace) %{_sysconfdir}/sysconfig/corosync-qnetd
 %if %{with systemd}
 %{_unitdir}/corosync-qnetd.service
-%dir %{_datadir}/corosync
-%{_datadir}/corosync/corosync-qnetd
 %else
 %{_initrddir}/corosync-qnetd
 %endif

init/Makefile.am

@@ -45,23 +45,24 @@ EXTRA_DIST		= corosync.in corosync-notifyd.in corosync.service.in \
 if INSTALL_SYSTEMD
 systemdconfdir	   = $(SYSTEMDDIR)
 systemdconf_DATA   = corosync.service corosync-notifyd.service
-initscriptdir	   = $(INITWRAPPERSDIR)
 else
 initscriptdir	   = $(INITDDIR)
-endif
 initscript_SCRIPTS  = corosync corosync-notifyd
+endif
 
 if BUILD_QDEVICES
-initscript_SCRIPTS  += corosync-qdevice
 if INSTALL_SYSTEMD
 systemdconf_DATA   += corosync-qdevice.service
+else
+initscript_SCRIPTS  += corosync-qdevice
 endif
 endif
 
 if BUILD_QNETD
-initscript_SCRIPTS  += corosync-qnetd
 if INSTALL_SYSTEMD
 systemdconf_DATA   += corosync-qnetd.service
+else
+initscript_SCRIPTS  += corosync-qnetd
 endif
 endif
 
@@ -78,7 +79,6 @@ endif
 		-e 's#@''SYSCONFDIR@#$(sysconfdir)#g' \
 		-e 's#@''INITCONFIGDIR@#$(INITCONFIGDIR)#g' \
 		-e 's#@''INITDDIR@#$(INITDDIR)#g' \
-		-e 's#@''INITWRAPPERSDIR@#$(INITWRAPPERSDIR)#g' \
 		-e 's#@''LOCALSTATEDIR@#$(localstatedir)#g' \
 		-e 's#@''BASHPATH@#${BASHPATH}#g' \
 	    > $@-t