change includer into build process

diff --git a/Makefile b/Makefile
index e22799fa8936d03cbc59bf937a59238a5d87a38b..234a8a5e4b2962713ff9d616345addf17157c124 100644 (file)
--- 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 8ab843d1d87241f34b9ee90db77ebc01ad347712..2295f737ac17e7d1ed4c17c02f89b7466a6fd956 100755 (executable)
--- 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 5679f385baeb75a809b2abfe48d2404b72c28c76..b3b07867e555b6951b9b9b42327224b23d567b3d 100755 (executable)
--- 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 060fa3b888ba1048e9d5d28e439a0193aaaaca08..e3741daf887c1eb497b5107a3cdba9da39668b1b 100755 (executable)
--- a/src/scantopdfgray
+++ b/src/scantopdfgray
@@ -1,6 +1,5 @@
 #!/bin/bash
-
-@scanbasic.sh@
+#include "scanbasic.sh"
 
 main()
 {