init: Simplify Makefile somehow

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>

diff --git a/config/init/systemd/Makefile.am b/config/init/systemd/Makefile.am
index 82587b019142f9a85aa9a88565f799722a4b40f4..6e2bb13b1e9396b6efb1fe0e660256b527d0d794 100644 (file)
--- 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 4372c2d145dffc1bf680f0de715a2c16a3fecc55..66c190d0822872b0afd5a5734da82b996907a0c1 100644 (file)
--- 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 fbca0bbee2c7a75cdcacc67cd81f134b24d8b7fa..32b90b918cb98436d5df4f326823fe97eb2424e5 100644 (file)
--- 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