install sysvinit script, and cleanup

diff --git a/Makefile b/Makefile
index fc660adc44409eba13c79649697ae00ca8463da4..1fcc353c8e7550f8d4f9c7a6247c622287361c2b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -14,33 +14,37 @@ nfblocker.5 nfblocker.8 nfblockerctl.8: %: %.adoc
        asciidoctor -bmanpage $<
 
 nfblocker: $(wildcard src/*.c)
-       # requires libnetfilter-queue-dev
        gcc -g -Wall -o $@ $^ -lnetfilter_queue
 
 # Installing the control script in $(INSTALLDIR)
 
-SBINFILES = nfblocker
-BINFILES = nfblockerctl
-ETCFILES = blocked/ acl/
-MAN5FILES = nfblocker.5
-MAN8FILES = nfblocker.8 nfblockerctl.8
-
 SBINDIR = $(DESTDIR)/usr/sbin
 BINDIR = $(DESTDIR)/usr/bin
-ETCDIR = $(DESTDIR)/etc/nfblocker
+CFGDIR = $(DESTDIR)/etc/nfblocker
 MAN5DIR = $(DESTDIR)/usr/share/man/man5
 MAN8DIR = $(DESTDIR)/usr/share/man/man8
 
-INSTALLTARGETS = $(addprefix $(SBINDIR)/,$(SBINFILES))
+SBINFILES = nfblocker
+BINFILES = nfblockerctl
+MAN5FILES = nfblocker.5
+MAN8FILES = nfblocker.8 nfblockerctl.8
+CFGDIRS = blocked/ acl/
+SYSVINIT = $(DESTDIR)/etc/init/nfblocker
+
+INSTALLTARGETS =  $(addprefix $(SBINDIR)/,$(SBINFILES))
 INSTALLTARGETS += $(addprefix $(BINDIR)/,$(BINFILES))
-INSTALLTARGETS += $(addprefix $(ETCDIR)/,$(ETCFILES))
 INSTALLTARGETS += $(addprefix $(MAN5DIR)/,$(MAN5FILES))
 INSTALLTARGETS += $(addprefix $(MAN8DIR)/,$(MAN8FILES))
+INSTALLTARGETS += $(addprefix $(CFGDIR)/,$(CFGDIRS))
+INSTALLTARGETS += $(SYSVINIT)
+
+$(SYSVINIT): init/nfblocker
+       install -D $< $@
 
-$(ETCDIR)/%/:
+$(CFGDIR)/%/:
        mkdir -p $@
 
-$(SBINDIR)/% $(BINDIR)/% $(ETCDIR)/% $(MAN5DIR)/% $(MAN8DIR)/%: %
+$(SBINDIR)/% $(BINDIR)/% $(MAN5DIR)/% $(MAN8DIR)/%: %
        install -D $< $@
 
 install: $(INSTALLTARGETS)