From fc556ec2bc92a9d476c11406fad2c33db8bf7cb0 Mon Sep 17 00:00:00 2001
From: Yves-Alexis Perez <corsac@debian.org>
Date: Mon, 1 Jun 2015 14:46:30 +0200
Subject: Imported Upstream version 5.3.1

---
 init/Makefile.am | 2 ++
 init/Makefile.in | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'init')

diff --git a/init/Makefile.am b/init/Makefile.am
index a72706c99..6fff4221b 100644
--- a/init/Makefile.am
+++ b/init/Makefile.am
@@ -2,8 +2,10 @@
 SUBDIRS =
 
 if USE_LEGACY_SYSTEMD
+if USE_CHARON
   SUBDIRS += systemd
 endif
+endif
 
 if USE_SYSTEMD
 if USE_SWANCTL
diff --git a/init/Makefile.in b/init/Makefile.in
index 18c69f1b0..883d42403 100644
--- a/init/Makefile.in
+++ b/init/Makefile.in
@@ -77,7 +77,7 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-@USE_LEGACY_SYSTEMD_TRUE@am__append_1 = systemd
+@USE_CHARON_TRUE@@USE_LEGACY_SYSTEMD_TRUE@am__append_1 = systemd
 @USE_SWANCTL_TRUE@@USE_SYSTEMD_TRUE@am__append_2 = systemd-swanctl
 subdir = init
 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
-- 
cgit v1.2.3