contrib/scripts: use awk to modify interpreter substitution lines.

diff --git a/contrib/scripts/Makefile.am b/contrib/scripts/Makefile.am
index 91b2bcd5aea91889e65574b1af192ef77bea1450..367e5c4c9a276280de02193cb62977839e78b283 100644 (file)
--- a/contrib/scripts/Makefile.am
+++ b/contrib/scripts/Makefile.am
@@ -29,7 +29,7 @@ EXTRA_DIST = \
 CLEANFILES = \
   $(noinst_SCRIPTS)
 
-do_subst = $(SED) -e 's,[@]PYTHON[@],$(PYTHON),g'
+do_subst = $(AWK) -v py="$(PYTHON)" '{gsub("@PYTHONEXE@",py); print $$0}'
 
 # Use SUFFIX Extension rules, they are more portable for every
 # implementation of 'make'.

diff --git a/contrib/scripts/gnunet-chk.py.in b/contrib/scripts/gnunet-chk.py.in
index 7d2cf73d305dc798e6d976a1af303b49b5cf7063..afc0924f4767570c618f61f43c3bd6d33ffee42e 100755 (executable)
--- a/contrib/scripts/gnunet-chk.py.in
+++ b/contrib/scripts/gnunet-chk.py.in
@@ -1,4 +1,4 @@
-#!@PYTHON@
+#!@PYTHONEXE@
 # This file is part of GNUnet.
 # (C) 2013, 2018 Christian Grothoff (and other contributing authors)
 #

diff --git a/contrib/scripts/gnunet-logread/Makefile.am b/contrib/scripts/gnunet-logread/Makefile.am
index 7903c07de181675a99ea1153931ce757ba622a3d..790b58fea183c993f6d85105523a443e2e47e9f1 100644 (file)
--- a/contrib/scripts/gnunet-logread/Makefile.am
+++ b/contrib/scripts/gnunet-logread/Makefile.am
@@ -1,7 +1,7 @@
 # This Makefile.am is in the public domain
 AM_CPPFLAGS = -I$(top_srcdir)/src/include -I$(top_builddir)/src/include
 
-do_subst = $(SED) -e 's,[@]PERL[@],$(PERL),g'
+do_subst = $(AWK) -v py="$(PERL)" '{gsub("@PERLEXE@",py); print $$0}'
 
 SUFFIXES = .in
 

diff --git a/contrib/scripts/gnunet-logread/gnunet-logread-ipc-sdedit.in b/contrib/scripts/gnunet-logread/gnunet-logread-ipc-sdedit.in
index f8b7dc7350335589c3f594aca02133e19da3c055..72a1551ae887a11ebf19e64fab33d72835d31618 100755 (executable)
--- a/contrib/scripts/gnunet-logread/gnunet-logread-ipc-sdedit.in
+++ b/contrib/scripts/gnunet-logread/gnunet-logread-ipc-sdedit.in
@@ -1,4 +1,4 @@
-#!@PERL@
+#!@PERLEXE@
 
 # 1. Start sdedit and enable 'RT diagram server' in 'Global preferences'.
 #

diff --git a/contrib/scripts/gnunet-logread/gnunet-logread.in b/contrib/scripts/gnunet-logread/gnunet-logread.in
index 9b1c65401bb4731e4c2209c370d2fd3222fcb4b1..e27c1d3fc7474185da548637b82866120dffe685 100755 (executable)
--- a/contrib/scripts/gnunet-logread/gnunet-logread.in
+++ b/contrib/scripts/gnunet-logread/gnunet-logread.in
@@ -1,4 +1,4 @@
-#!@PERL@
+#!@PERLEXE@
 # helper tool to make gnunet logs more readable
 # try 'gnunet-logread -h' for usage
 

diff --git a/contrib/scripts/gnunet_janitor.py.in b/contrib/scripts/gnunet_janitor.py.in
index d6834bfb4ba7147e7b010ef05d24b2a3318e4dfa..9d28d38e6ff422e14372533456ff2a59e25e5ea4 100644 (file)
--- a/contrib/scripts/gnunet_janitor.py.in
+++ b/contrib/scripts/gnunet_janitor.py.in
@@ -1,4 +1,4 @@
-#!@PYTHON@
+#!@PYTHONEXE@
 #    This file is part of GNUnet.
 #    (C) 2011, 2018 Christian Grothoff (and other contributing authors)
 #

diff --git a/contrib/scripts/gnunet_pyexpect.py.in b/contrib/scripts/gnunet_pyexpect.py.in
index 48f8acdc1316fd1f40ad4ea2d03e0683089eb6a8..1124dc33c452738d20b845d99152b7f3b648ede4 100644 (file)
--- a/contrib/scripts/gnunet_pyexpect.py.in
+++ b/contrib/scripts/gnunet_pyexpect.py.in
@@ -1,4 +1,4 @@
-#!@PYTHON@
+#!@PYTHONEXE@
 #    This file is part of GNUnet.
 #    (C) 2010, 2018 Christian Grothoff (and other contributing authors)
 #

diff --git a/contrib/scripts/pydiffer.py.in b/contrib/scripts/pydiffer.py.in
index 08f0f4ae6bed70f32042729abdfa8934a8670c05..5235df3f789843d127e7849397144993cb4fda52 100644 (file)
--- a/contrib/scripts/pydiffer.py.in
+++ b/contrib/scripts/pydiffer.py.in
@@ -1,4 +1,4 @@
-#!@PYTHON@
+#!@PYTHONEXE@
 
 import os
 import sys

diff --git a/contrib/scripts/removetrailingwhitespace.py.in b/contrib/scripts/removetrailingwhitespace.py.in
index e6c2d901488e9baf3dc4bf9c7a45182dd801ae07..6a133ecd0bd002e0ddc00bc26f02374907d443ed 100755 (executable)
--- a/contrib/scripts/removetrailingwhitespace.py.in
+++ b/contrib/scripts/removetrailingwhitespace.py.in
@@ -1,4 +1,4 @@
-#!@PYTHON@
+#!@PYTHONEXE@
 
 import sys
 import re

diff --git a/contrib/scripts/terminate.py.in b/contrib/scripts/terminate.py.in
index 2cb4a13c4881bc922b66cb59b17fe6ca20751d39..c82fdc981a225ceb1e6a089e8f0bb0e50fb09a10 100644 (file)
--- a/contrib/scripts/terminate.py.in
+++ b/contrib/scripts/terminate.py.in
@@ -1,4 +1,4 @@
-#!@PYTHON@
+#!@PYTHONEXE@
 #    This file is part of GNUnet.
 #    (C) 2011, 2018 Christian Grothoff (and other contributing authors)
 #