Quoting Stéphane Graber ([email protected]): > Signed-off-by: Stéphane Graber <[email protected]>
heh. Acked-by: Serge E. Hallyn <[email protected]> > --- > 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 82587b0..6e2bb13 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 4372c2d..66c190d 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 fbca0bb..32b90b9 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 > -- > 1.8.5.2 > > _______________________________________________ > lxc-devel mailing list > [email protected] > http://lists.linuxcontainers.org/listinfo/lxc-devel _______________________________________________ lxc-devel mailing list [email protected] http://lists.linuxcontainers.org/listinfo/lxc-devel
