Просмотр исходного кода

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>
Fabio M. Di Nitto 14 лет назад
Родитель
Сommit
769a69e41f
3 измененных файлов с 9 добавлено и 2 удалено
  1. 6 0
      configure.ac
  2. 2 1
      corosync.spec.in
  3. 1 1
      init/Makefile.am

+ 6 - 0
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])

+ 2 - 1
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}
 

+ 1 - 1
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