From 6c9cb24ca74ac72eee006a85de72a61915ffbe07 Mon Sep 17 00:00:00 2001 From: Arnaudv6 <2178699-Arnaudv6@users.noreply.gitlab.com> Date: Fri, 13 Mar 2026 11:46:57 +0100 Subject: [PATCH 1/3] fix packaging Makefile --- packaging/Makefile | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/packaging/Makefile b/packaging/Makefile index ac1a064..cb55222 100644 --- a/packaging/Makefile +++ b/packaging/Makefile @@ -4,8 +4,11 @@ MANDIR = $(PREFIX)/share/man/man1 SYSTEMDDIR ?= /etc/systemd install: - install -Dm755 reaction $(DESTDIR)$(BINDIR) - install -Dm755 reaction-plugin-virtual $(DESTDIR)$(BINDIR) + install -Dm755 reaction $(DESTDIR)$(BINDIR) + install -Dm755 reaction-plugin-cluster $(DESTDIR)$(BINDIR) + install -Dm755 reaction-plugin-ipset $(DESTDIR)$(BINDIR) + install -Dm755 reaction-plugin-nftables $(DESTDIR)$(BINDIR) + install -Dm755 reaction-plugin-virtual $(DESTDIR)$(BINDIR) install -Dm644 reaction*.1 -t $(DESTDIR)$(MANDIR)/ install -Dm644 reaction.bash $(DESTDIR)$(PREFIX)/share/bash-completion/completions/reaction install -Dm644 reaction.fish $(DESTDIR)$(PREFIX)/share/fish/vendor_completions.d/reaction.fish @@ -16,11 +19,13 @@ install-ipset: install -Dm755 reaction-plugin-ipset $(DESTDIR)$(BINDIR) remove: - rm -f $(DESTDIR)$(BINDIR)/bin/reaction - rm -f $(DESTDIR)$(BINDIR)/bin/reaction-plugin-virtual - rm -f $(DESTDIR)$(BINDIR)/bin/reaction-plugin-ipset + rm -f $(DESTDIR)$(BINDIR)/reaction + rm -f $(DESTDIR)$(BINDIR)/reaction-plugin-cluster + rm -f $(DESTDIR)$(BINDIR)/reaction-plugin-ipset + rm -f $(DESTDIR)$(BINDIR)/reaction-plugin-nftables + rm -f $(DESTDIR)$(BINDIR)/reaction-plugin-virtual rm -f $(DESTDIR)$(MANDIR)/reaction*.1 - rm -f $(DESTDIR)$(PREFIX)/share/bash-completion/completions/reaction + rm -f $(DESTDIR)$(PREFIX)/share/bash-completion/completions/reaction.bash rm -f $(DESTDIR)$(PREFIX)/share/fish/vendor_completions.d/reaction.fish rm -f $(DESTDIR)$(PREFIX)/share/zsh/vendor-completions/_reaction rm -f $(SYSTEMDDIR)/system/reaction.service From 14a0ded68d6ffa5186995a4f529240e6518be5fd Mon Sep 17 00:00:00 2001 From: Arnaud Vallette d Osia Date: Fri, 13 Mar 2026 10:50:11 +0000 Subject: [PATCH 2/3] my bad --- packaging/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/Makefile b/packaging/Makefile index cb55222..c7db8c5 100644 --- a/packaging/Makefile +++ b/packaging/Makefile @@ -25,7 +25,7 @@ remove: rm -f $(DESTDIR)$(BINDIR)/reaction-plugin-nftables rm -f $(DESTDIR)$(BINDIR)/reaction-plugin-virtual rm -f $(DESTDIR)$(MANDIR)/reaction*.1 - rm -f $(DESTDIR)$(PREFIX)/share/bash-completion/completions/reaction.bash + rm -f $(DESTDIR)$(PREFIX)/share/bash-completion/completions/reaction rm -f $(DESTDIR)$(PREFIX)/share/fish/vendor_completions.d/reaction.fish rm -f $(DESTDIR)$(PREFIX)/share/zsh/vendor-completions/_reaction rm -f $(SYSTEMDDIR)/system/reaction.service From 5a78e51f1dff8af70e9434b70b97e6253754af4b Mon Sep 17 00:00:00 2001 From: Arnaudv6 <2178699-Arnaudv6@users.noreply.gitlab.com> Date: Fri, 13 Mar 2026 12:05:51 +0100 Subject: [PATCH 3/3] merge work from !31 --- packaging/Makefile | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/packaging/Makefile b/packaging/Makefile index c7db8c5..b7cfaab 100644 --- a/packaging/Makefile +++ b/packaging/Makefile @@ -1,31 +1,32 @@ PREFIX ?= /usr/local BINDIR = $(PREFIX)/bin MANDIR = $(PREFIX)/share/man/man1 -SYSTEMDDIR ?= /etc/systemd +SYSTEMDDIR ?= $(PREFIX)/lib/systemd install: - install -Dm755 reaction $(DESTDIR)$(BINDIR) - install -Dm755 reaction-plugin-cluster $(DESTDIR)$(BINDIR) - install -Dm755 reaction-plugin-ipset $(DESTDIR)$(BINDIR) - install -Dm755 reaction-plugin-nftables $(DESTDIR)$(BINDIR) - install -Dm755 reaction-plugin-virtual $(DESTDIR)$(BINDIR) + install -Dm755 reaction $(DESTDIR)$(BINDIR)/reaction install -Dm644 reaction*.1 -t $(DESTDIR)$(MANDIR)/ install -Dm644 reaction.bash $(DESTDIR)$(PREFIX)/share/bash-completion/completions/reaction install -Dm644 reaction.fish $(DESTDIR)$(PREFIX)/share/fish/vendor_completions.d/reaction.fish install -Dm644 _reaction $(DESTDIR)$(PREFIX)/share/zsh/vendor-completions/_reaction - install -Dm644 reaction.service $(SYSTEMDDIR)/system/reaction.service + install -Dm644 reaction.service $(DESTDIR)$(SYSTEMDDIR)/system/reaction.service -install-ipset: - install -Dm755 reaction-plugin-ipset $(DESTDIR)$(BINDIR) +install-plugins: + install -Dm755 reaction-plugin-cluster $(DESTDIR)$(BINDIR)/reaction-plugin-cluster + install -Dm755 reaction-plugin-ipset $(DESTDIR)$(BINDIR)/reaction-plugin-ipset + install -Dm755 reaction-plugin-nftables $(DESTDIR)$(BINDIR)/reaction-plugin-nftables + install -Dm755 reaction-plugin-virtual $(DESTDIR)$(BINDIR)/reaction-plugin-virtual remove: rm -f $(DESTDIR)$(BINDIR)/reaction - rm -f $(DESTDIR)$(BINDIR)/reaction-plugin-cluster - rm -f $(DESTDIR)$(BINDIR)/reaction-plugin-ipset - rm -f $(DESTDIR)$(BINDIR)/reaction-plugin-nftables - rm -f $(DESTDIR)$(BINDIR)/reaction-plugin-virtual rm -f $(DESTDIR)$(MANDIR)/reaction*.1 rm -f $(DESTDIR)$(PREFIX)/share/bash-completion/completions/reaction rm -f $(DESTDIR)$(PREFIX)/share/fish/vendor_completions.d/reaction.fish rm -f $(DESTDIR)$(PREFIX)/share/zsh/vendor-completions/_reaction - rm -f $(SYSTEMDDIR)/system/reaction.service + rm -f $(DESTDIR)$(SYSTEMDDIR)/system/reaction.service + +remove-plugins: + rm -f $(DESTDIR)$(BINDIR)/reaction-plugin-cluster + rm -f $(DESTDIR)$(BINDIR)/reaction-plugin-ipset + rm -f $(DESTDIR)$(BINDIR)/reaction-plugin-nftables + rm -f $(DESTDIR)$(BINDIR)/reaction-plugin-virtual