rewrite sed logic used in Makefiles and move into dosubst awk script.

include 'bin' and its files in dist files, this is where dosubst is located.

While the invocation (passing of the variables)
is not optimal (yet, will be changed), this
will in the end allow sharing code between Makefiles better,
and maybe drop sed usage in the future.

2 files changed, 3 insertions, 9 deletions

diff --git a/src/dht/Makefile.am b/src/dht/Makefile.am
index bf73e8f19..2182d1c7f 100644
--- a/src/dht/Makefile.am
+++ b/src/dht/Makefile.am
@@ -220,13 +220,7 @@ check_SCRIPTS = \
   test_dht_tools.py
 endif
 
-do_subst = $(SED) -e 's,[@]PYTHON[@],$(PYTHON),g' -e 's,[@]bindir[@],$(bindir),g'
-
 SUFFIXES = .py.in .py
 .py.in.py:
-        $(do_subst) < $(srcdir)/$< > $@
+        $(AWK) -v bdir="$(bindir)" -v py="$(PYTHON)" -v awkay="$(AWK_BINARY)" -v pfx="$(prefix)" -v prl="$(PERL)" -v sysconfdirectory="$(sysconfdir)" -v pkgdatadirectory="$(pkgdatadir)" -f $(top_srcdir)/bin/dosubst.awk < $(srcdir)/$< > $@
         chmod +x $@
-
-test_dht_tools.py: test_dht_tools.py.in Makefile
-        $(do_subst) < $(srcdir)/test_dht_tools.py.in > test_dht_tools.py
-        chmod +x test_dht_tools.py
diff --git a/src/dht/test_dht_tools.py.in b/src/dht/test_dht_tools.py.in
index c2f95e4b5..20739c45f 100644
--- a/src/dht/test_dht_tools.py.in
+++ b/src/dht/test_dht_tools.py.in
@@ -1,4 +1,4 @@
-#!@PYTHON@
+#!@PYTHONEXE@
 #
 # This testcase simply checks that the DHT command-line tools work.
 # It launches a single peer, stores a value "testdata" under "testkey",
@@ -20,7 +20,7 @@ import subprocess
 import time
 import tempfile
 
-os.environ["PATH"] = "@bindir@" + ":" + os.environ["PATH"]
+os.environ["PATH"] = "@bindirectory@" + ":" + os.environ["PATH"]
 
 if os.name == "nt":
     tmp = os.getenv("TEMP")