From: Martin Pitt Date: Thu, 31 Jul 2014 06:53:52 +0000 (+0200) Subject: Get systemd unit dir from pkg-config X-Git-Tag: lxc-1.1.0.alpha2~110 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=213b0fe063ffa03d4ab1307a0dbe234e98693e0b;p=thirdparty%2Flxc.git Get systemd unit dir from pkg-config Don't install systemd unit files into $(prefix), they won't work there. Instead, get them from systemd's pkg-config file. Signed-off-by: Martin Pitt Acked-by: Serge E. Hallyn --- diff --git a/config/init/systemd/Makefile.am b/config/init/systemd/Makefile.am index fc374c520..3bd221fc9 100644 --- a/config/init/systemd/Makefile.am +++ b/config/init/systemd/Makefile.am @@ -3,8 +3,6 @@ EXTRA_DIST = \ lxc.service if INIT_SCRIPT_SYSTEMD -SYSTEMD_UNIT_DIR = $(prefix)/lib/systemd/system - lxc-autostart-helper: ../sysvinit/lxc.in $(top_builddir)/config.status $(AM_V_GEN)sed \ -e 's|[@]SYSCONFDIR[@]|$(sysconfdir)|g' \ diff --git a/configure.ac b/configure.ac index 4f39054e1..db8e43a71 100644 --- a/configure.ac +++ b/configure.ac @@ -122,6 +122,18 @@ AM_CONDITIONAL([INIT_SCRIPT_SYSTEMD], [echo "$init_script" |grep -q "systemd"]) AM_CONDITIONAL([INIT_SCRIPT_UPSTART], [echo "$init_script" |grep -q "upstart"]) AC_MSG_RESULT($init_script) +# systemd unit dir +AC_ARG_WITH([systemdsystemunitdir], + AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]), + [], + [with_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd)]) +if test -z "$with_systemdsystemunitdir"; then + with_systemdsystemunitdir=/lib/systemd/system +fi +if test "x$with_systemdsystemunitdir" != "xno"; then + AC_SUBST([SYSTEMD_UNIT_DIR], [$with_systemdsystemunitdir]) +fi + # Allow disabling rpath AC_ARG_ENABLE([rpath], [AC_HELP_STRING([--enable-rpath], [set rpath in executables [default=no]])],