diff --git a/builder/Makefile b/builder/Makefile index b1373355..80a46cde 100644 --- a/builder/Makefile +++ b/builder/Makefile @@ -3,7 +3,6 @@ PYVER := $(shell $(PYTHON) -c 'import sys; print("%.1s" %(sys.version))') BINFILES = kojid LIBEXECFILES = mergerepos SYSTEMDSYSTEMUNITDIR = $(shell pkg-config systemd --variable=systemdsystemunitdir) -TYPE = systemd _default: @echo "nothing to make. try make install" @@ -33,15 +32,6 @@ _install: mkdir -p $(DESTDIR)/etc/kojid install -p -m 644 kojid.conf $(DESTDIR)/etc/kojid/kojid.conf -install-systemd: _install +install: _install mkdir -p $(DESTDIR)$(SYSTEMDSYSTEMUNITDIR) install -p -m 644 kojid.service $(DESTDIR)$(SYSTEMDSYSTEMUNITDIR) - -install-sysv: _install - mkdir -p $(DESTDIR)/etc/rc.d/init.d - install -p -m 755 kojid.init $(DESTDIR)/etc/rc.d/init.d/kojid - - mkdir -p $(DESTDIR)/etc/sysconfig - install -p -m 644 kojid.sysconfig $(DESTDIR)/etc/sysconfig/kojid - -install: install-$(TYPE) diff --git a/util/Makefile b/util/Makefile index 7c068d38..da48a440 100644 --- a/util/Makefile +++ b/util/Makefile @@ -1,6 +1,5 @@ BINFILES = kojira koji-gc koji-shadow koji-sweep-db koji-sidetag-cleanup SYSTEMDSYSTEMUNITDIR = $(shell pkg-config systemd --variable=systemdsystemunitdir) -TYPE = systemd _default: @echo "nothing to make. try make install" @@ -29,16 +28,10 @@ _install: mkdir -p $(DESTDIR)/etc/koji-shadow install -p -m 644 koji-shadow.conf $(DESTDIR)/etc/koji-shadow/koji-shadow.conf -install-systemd: _install +install: _install mkdir -p $(DESTDIR)$(SYSTEMDSYSTEMUNITDIR) install -p -m 644 kojira.service $(DESTDIR)$(SYSTEMDSYSTEMUNITDIR) install -p -m 644 koji-gc.service $(DESTDIR)$(SYSTEMDSYSTEMUNITDIR) install -p -m 644 koji-gc.timer $(DESTDIR)$(SYSTEMDSYSTEMUNITDIR) install -p -m 644 koji-sweep-db.service $(DESTDIR)$(SYSTEMDSYSTEMUNITDIR) install -p -m 644 koji-sweep-db.timer $(DESTDIR)$(SYSTEMDSYSTEMUNITDIR) - -install-sysv: _install - # no more utils support for sysv - true - -install: install-$(TYPE) diff --git a/vm/Makefile b/vm/Makefile index 4916199a..4f2ea421 100644 --- a/vm/Makefile +++ b/vm/Makefile @@ -1,7 +1,6 @@ BINFILES = kojivmd SHAREFILES = kojikamid SYSTEMDSYSTEMUNITDIR = $(shell pkg-config systemd --variable=systemdsystemunitdir) -TYPE = systemd _default: @echo "nothing to make. try make install" @@ -28,15 +27,6 @@ _install: kojikamid mkdir -p $(DESTDIR)/etc/kojivmd install -p -m 644 kojivmd.conf $(DESTDIR)/etc/kojivmd/kojivmd.conf -install-systemd: _install +install: _install mkdir -p $(DESTDIR)$(SYSTEMDSYSTEMUNITDIR) install -p -m 644 kojivmd.service $(DESTDIR)$(SYSTEMDSYSTEMUNITDIR) - -install-sysv: _install - mkdir -p $(DESTDIR)/etc/rc.d/init.d - install -p -m 755 kojivmd.init $(DESTDIR)/etc/rc.d/init.d/kojivmd - - mkdir -p $(DESTDIR)/etc/sysconfig - install -p -m 644 kojivmd.sysconfig $(DESTDIR)/etc/sysconfig/kojivmd - -install: install-$(TYPE)