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, 5 deletions

diff --git a/src/statistics/Makefile.am b/src/statistics/Makefile.am
index 6d69d58d8..52f382156 100644
--- a/src/statistics/Makefile.am
+++ b/src/statistics/Makefile.am
@@ -84,15 +84,13 @@ check_SCRIPTS = \
   test_gnunet_statistics.py
 endif
 
-do_subst = $(SED) -e 's,[@]PYTHON[@],$(PYTHON),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_gnunet_statistics.py: test_gnunet_statistics.py.in Makefile
-        $(do_subst) < $(srcdir)/test_gnunet_statistics.py.in > test_gnunet_statistics.py
+        $(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)/test_gnunet_statistics.py.in > test_gnunet_statistics.py
         chmod +x test_gnunet_statistics.py
 
 EXTRA_DIST = \
diff --git a/src/statistics/test_gnunet_statistics.py.in b/src/statistics/test_gnunet_statistics.py.in
index 3a13c24f3..ce277b13e 100644
--- a/src/statistics/test_gnunet_statistics.py.in
+++ b/src/statistics/test_gnunet_statistics.py.in
@@ -1,4 +1,4 @@
-#!@PYTHON@
+#!@PYTHONEXE@
 
 import os
 import sys