From a7d91e1d30d20f75018b9e422e7f28169b734cd4 Mon Sep 17 00:00:00 2001 From: Bastian Dehn Date: Thu, 2 Apr 2026 17:18:22 +0200 Subject: [PATCH] change includer into build process --- Makefile | 12 +++--------- src/scantopdf | 3 +-- src/scantopdfbw | 3 +-- src/scantopdfgray | 3 +-- 4 files changed, 6 insertions(+), 15 deletions(-) diff --git a/Makefile b/Makefile index e22799f..234a8a5 100644 --- a/Makefile +++ b/Makefile @@ -35,9 +35,7 @@ $(PACKAGEDIR)/$(BINDIR)/scantopdf: \ $(SRCDIR)/scantopdf mkdir -p $(@D) - cat $(SRCDIR)/scantopdf \ - | sed "/@scanbasic.sh@/r $(SRCDIR)/scanbasic.sh" \ - | sed "/@scanbasic.sh@/d" \ + ./tools/includer $(SRCDIR)/scantopdf \ | sed "s/@VERSION@/$(VERSION)/" \ > $(PACKAGEDIR)/$(BINDIR)/scantopdf chmod 755 $(PACKAGEDIR)/$(BINDIR)/scantopdf @@ -47,9 +45,7 @@ $(PACKAGEDIR)/$(BINDIR)/scantopdfgray: \ $(SRCDIR)/scantopdfgray mkdir -p $(@D) - cat $(SRCDIR)/scantopdfgray \ - | sed "/@scanbasic.sh@/r $(SRCDIR)/scanbasic.sh" \ - | sed "/@scanbasic.sh@/d" \ + ./tools/includer $(SRCDIR)/scantopdfgray \ | sed "s/@VERSION@/$(VERSION)/" \ > $(PACKAGEDIR)/$(BINDIR)/scantopdfgray chmod 755 $(PACKAGEDIR)/$(BINDIR)/scantopdfgray @@ -59,9 +55,7 @@ $(PACKAGEDIR)/$(BINDIR)/scantopdfbw: \ $(SRCDIR)/scantopdfbw mkdir -p $(@D) - cat $(SRCDIR)/scantopdfbw \ - | sed "/@scanbasic.sh@/r $(SRCDIR)/scanbasic.sh" \ - | sed "/@scanbasic.sh@/d" \ + ./tools/includer $(SRCDIR)/scantopdfgray \ | sed "s/@VERSION@/$(VERSION)/" \ > $(PACKAGEDIR)/$(BINDIR)/scantopdfbw chmod 755 $(PACKAGEDIR)/$(BINDIR)/scantopdfbw diff --git a/src/scantopdf b/src/scantopdf index 8ab843d..2295f73 100755 --- a/src/scantopdf +++ b/src/scantopdf @@ -1,6 +1,5 @@ #!/bin/bash - -# @scanbasic.sh@ +#include "scanbasic.sh" main() { diff --git a/src/scantopdfbw b/src/scantopdfbw index 5679f38..b3b0786 100755 --- a/src/scantopdfbw +++ b/src/scantopdfbw @@ -1,6 +1,5 @@ #!/bin/bash - -@scanbasic.sh@ +#include "scanbasic.sh" main() { diff --git a/src/scantopdfgray b/src/scantopdfgray index 060fa3b..e3741da 100755 --- a/src/scantopdfgray +++ b/src/scantopdfgray @@ -1,6 +1,5 @@ #!/bin/bash - -@scanbasic.sh@ +#include "scanbasic.sh" main() { -- 2.47.3