From ff44e6c201bd114a30baffeaac16f41dabcfb036 Mon Sep 17 00:00:00 2001 From: Ralph Ronnquist Date: Mon, 17 Feb 2025 18:54:29 +1100 Subject: [PATCH] install sysvinit script, and cleanup --- Makefile | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/Makefile b/Makefile index fc660ad..1fcc353 100644 --- 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) -- 2.47.2