From 87c7e080c8e2d4b702a23c38d10e39bccdfd03e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber@ubuntu.com>
Date: Thu, 16 Jan 2014 17:31:05 -0500
Subject: [PATCH] init: Simplify Makefile somehow
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
---
 config/init/systemd/Makefile.am  | 8 +++-----
 config/init/sysvinit/Makefile.am | 6 +-----
 config/init/upstart/Makefile.am  | 6 +-----
 3 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/config/init/systemd/Makefile.am b/config/init/systemd/Makefile.am
index 82587b019..6e2bb13b1 100644
--- a/config/init/systemd/Makefile.am
+++ b/config/init/systemd/Makefile.am
@@ -8,6 +8,7 @@ SYSTEMD_UNIT_DIR = /lib/systemd/system
 else
 SYSTEMD_UNIT_DIR = /usr/lib/systemd/system
 endif
+
 install-systemd: lxc.service lxc-devsetup
 	$(MKDIR_P) $(DESTDIR)$(SYSTEMD_UNIT_DIR)
 	$(INSTALL_DATA) lxc.service $(DESTDIR)$(SYSTEMD_UNIT_DIR)/
@@ -15,12 +16,9 @@ install-systemd: lxc.service lxc-devsetup
 uninstall-systemd:
 	rm -f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/lxc.service
 	rmdir $(DESTDIR)$(SYSTEMD_UNIT_DIR) || :
+
 pkglibexec_SCRIPTS = lxc-devsetup
-else
-install-systemd:
-uninstall-systemd:
-endif
 
 install-data-local: install-systemd
-
 uninstall-local: uninstall-systemd
+endif
diff --git a/config/init/sysvinit/Makefile.am b/config/init/sysvinit/Makefile.am
index 4372c2d14..66c190d08 100644
--- a/config/init/sysvinit/Makefile.am
+++ b/config/init/sysvinit/Makefile.am
@@ -8,11 +8,7 @@ install-sysvinit: lxc
 uninstall-sysvinit:
 	rm -f $(DESTDIR)$(sysconfdir)/rc.d/init.d/lxc
 	rmdir $(DESTDIR)$(sysconfdir)/rc.d/init.d || :
-else
-install-sysvinit:
-uninstall-sysvinit:
-endif
 
 install-data-local: install-sysvinit
-
 uninstall-local: uninstall-sysvinit
+endif
diff --git a/config/init/upstart/Makefile.am b/config/init/upstart/Makefile.am
index fbca0bbee..32b90b918 100644
--- a/config/init/upstart/Makefile.am
+++ b/config/init/upstart/Makefile.am
@@ -12,11 +12,7 @@ uninstall-upstart:
 	rm -f $(DESTDIR)$(sysconfdir)/init/lxc-instance.conf
 	rm -f $(DESTDIR)$(sysconfdir)/init/lxc-net.conf
 	rmdir $(DESTDIR)$(sysconfdir)/init || :
-else
-install-upstart:
-uninstall-upstart:
-endif
 
 install-data-local: install-upstart
-
 uninstall-local: uninstall-upstart
+endif