aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorng0 <ng0@n0.is>2019-12-02 15:30:56 +0000
committerng0 <ng0@n0.is>2019-12-02 15:30:56 +0000
commitc8e5e28048dd9605f7958ef95f2a6dd626658069 (patch)
tree52375a14cc93c4161a658b4c7a1926dda11d8909 /src
parent53f35813d89de6f7c91883277129ffda3ca5b772 (diff)
downloadgnunet-c8e5e28048dd9605f7958ef95f2a6dd626658069.tar.gz
gnunet-c8e5e28048dd9605f7958ef95f2a6dd626658069.zip
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.
Diffstat (limited to 'src')
-rw-r--r--src/arm/Makefile.am6
-rw-r--r--src/arm/test_gnunet_arm.py.in2
-rw-r--r--src/consensus/Makefile.am4
-rw-r--r--src/consensus/consensus-simulation.py.in2
-rw-r--r--src/dht/Makefile.am8
-rw-r--r--src/dht/test_dht_tools.py.in4
-rw-r--r--src/fs/Makefile.am10
-rwxr-xr-xsrc/fs/test_gnunet_fs_idx.py.in2
-rwxr-xr-xsrc/fs/test_gnunet_fs_psd.py.in2
-rwxr-xr-xsrc/fs/test_gnunet_fs_rec.py.in2
-rw-r--r--src/gns/Makefile.am9
-rw-r--r--src/gns/gnunet-gns-proxy-setup-ca.in20
-rwxr-xr-xsrc/gns/test_gnunet_gns.sh.in6
-rw-r--r--src/integration-tests/Makefile.am20
-rw-r--r--src/integration-tests/gnunet_pyexpect.py.in2
-rw-r--r--src/integration-tests/gnunet_testing.py.in2
-rwxr-xr-xsrc/integration-tests/test_integration_bootstrap_and_connect.py.in2
-rwxr-xr-xsrc/integration-tests/test_integration_clique.py.in2
-rwxr-xr-xsrc/integration-tests/test_integration_disconnect.py.in2
-rwxr-xr-xsrc/integration-tests/test_integration_disconnect_nat.py.in2
-rwxr-xr-xsrc/integration-tests/test_integration_reconnect.py.in2
-rwxr-xr-xsrc/integration-tests/test_integration_reconnect_nat.py.in2
-rw-r--r--src/peerinfo-tool/Makefile.am4
-rwxr-xr-xsrc/peerinfo-tool/test_gnunet_peerinfo.py.in2
-rw-r--r--src/revocation/Makefile.am4
-rw-r--r--src/revocation/test_local_revocation.py.in2
-rw-r--r--src/statistics/Makefile.am6
-rw-r--r--src/statistics/test_gnunet_statistics.py.in2
-rw-r--r--src/transport/gnunet-transport-certificate-creation.in4
29 files changed, 56 insertions, 81 deletions
diff --git a/src/arm/Makefile.am b/src/arm/Makefile.am
index 43e868805..8a738c5a9 100644
--- a/src/arm/Makefile.am
+++ b/src/arm/Makefile.am
@@ -88,15 +88,13 @@ test_gnunet_service_arm_SOURCES = \
88 libgnunetarm.la \ 88 libgnunetarm.la \
89 $(top_builddir)/src/util/libgnunetutil.la 89 $(top_builddir)/src/util/libgnunetutil.la
90 90
91do_subst = $(SED) -e 's,[@]PYTHON[@],$(PYTHON),g'
92
93SUFFIXES = .py.in .py 91SUFFIXES = .py.in .py
94.py.in.py: 92.py.in.py:
95 $(do_subst) < $(srcdir)/$< > $@ 93 $(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)/$< > $@
96 chmod +x $@ 94 chmod +x $@
97 95
98test_gnunet_arm.py: test_gnunet_arm.py.in Makefile 96test_gnunet_arm.py: test_gnunet_arm.py.in Makefile
99 $(do_subst) < $(srcdir)/test_gnunet_arm.py.in > test_gnunet_arm.py 97 $(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_arm.py.in > test_gnunet_arm.py
100 chmod +x test_gnunet_arm.py 98 chmod +x test_gnunet_arm.py
101 99
102EXTRA_DIST = \ 100EXTRA_DIST = \
diff --git a/src/arm/test_gnunet_arm.py.in b/src/arm/test_gnunet_arm.py.in
index 9605c4eae..e657d4a3f 100644
--- a/src/arm/test_gnunet_arm.py.in
+++ b/src/arm/test_gnunet_arm.py.in
@@ -1,4 +1,4 @@
1#!@PYTHON@ 1#!@PYTHONEXE@
2 2
3import os 3import os
4import sys 4import sys
diff --git a/src/consensus/Makefile.am b/src/consensus/Makefile.am
index 4ad224aa3..24e685fb9 100644
--- a/src/consensus/Makefile.am
+++ b/src/consensus/Makefile.am
@@ -23,12 +23,10 @@ libexec_PROGRAMS += \
23 gnunet-service-evil-consensus 23 gnunet-service-evil-consensus
24endif 24endif
25 25
26do_subst = $(SED) -e 's,[@]PYTHON[@],$(PYTHON),g'
27
28SUFFIXES = .py.in .py 26SUFFIXES = .py.in .py
29 27
30.py.in.py: 28.py.in.py:
31 $(do_subst) < $< > $@ 29 $(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 < $< > $@
32 chmod +x $@ 30 chmod +x $@
33 31
34check-python-style: 32check-python-style:
diff --git a/src/consensus/consensus-simulation.py.in b/src/consensus/consensus-simulation.py.in
index c6b97e63f..272a52da2 100644
--- a/src/consensus/consensus-simulation.py.in
+++ b/src/consensus/consensus-simulation.py.in
@@ -1,4 +1,4 @@
1#!@PYTHON@ 1#!@PYTHONEXE@
2# This file is part of GNUnet 2# This file is part of GNUnet
3# (C) 2013, 2018 Christian Grothoff (and other contributing authors) 3# (C) 2013, 2018 Christian Grothoff (and other contributing authors)
4# 4#
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 = \
220 test_dht_tools.py 220 test_dht_tools.py
221endif 221endif
222 222
223do_subst = $(SED) -e 's,[@]PYTHON[@],$(PYTHON),g' -e 's,[@]bindir[@],$(bindir),g'
224
225SUFFIXES = .py.in .py 223SUFFIXES = .py.in .py
226.py.in.py: 224.py.in.py:
227 $(do_subst) < $(srcdir)/$< > $@ 225 $(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)/$< > $@
228 chmod +x $@ 226 chmod +x $@
229
230test_dht_tools.py: test_dht_tools.py.in Makefile
231 $(do_subst) < $(srcdir)/test_dht_tools.py.in > test_dht_tools.py
232 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 @@
1#!@PYTHON@ 1#!@PYTHONEXE@
2# 2#
3# This testcase simply checks that the DHT command-line tools work. 3# This testcase simply checks that the DHT command-line tools work.
4# It launches a single peer, stores a value "testdata" under "testkey", 4# It launches a single peer, stores a value "testdata" under "testkey",
@@ -20,7 +20,7 @@ import subprocess
20import time 20import time
21import tempfile 21import tempfile
22 22
23os.environ["PATH"] = "@bindir@" + ":" + os.environ["PATH"] 23os.environ["PATH"] = "@bindirectory@" + ":" + os.environ["PATH"]
24 24
25if os.name == "nt": 25if os.name == "nt":
26 tmp = os.getenv("TEMP") 26 tmp = os.getenv("TEMP")
diff --git a/src/fs/Makefile.am b/src/fs/Makefile.am
index f0efefc4b..b1555be60 100644
--- a/src/fs/Makefile.am
+++ b/src/fs/Makefile.am
@@ -525,22 +525,20 @@ perf_gnunet_service_fs_p2p_respect_LDADD = \
525 $(top_builddir)/src/util/libgnunetutil.la 525 $(top_builddir)/src/util/libgnunetutil.la
526 526
527 527
528do_subst = $(SED) -e 's,[@]PYTHON[@],$(PYTHON),g'
529
530test_gnunet_fs_psd.py: test_gnunet_fs_psd.py.in Makefile 528test_gnunet_fs_psd.py: test_gnunet_fs_psd.py.in Makefile
531 $(do_subst) < $(srcdir)/test_gnunet_fs_psd.py.in > test_gnunet_fs_psd.py 529 $(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_fs_psd.py.in > test_gnunet_fs_psd.py
532 chmod +x test_gnunet_fs_psd.py 530 chmod +x test_gnunet_fs_psd.py
533 531
534test_gnunet_fs_rec.py: test_gnunet_fs_rec.py.in Makefile 532test_gnunet_fs_rec.py: test_gnunet_fs_rec.py.in Makefile
535 $(do_subst) < $(srcdir)/test_gnunet_fs_rec.py.in > test_gnunet_fs_rec.py 533 $(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_fs_rec.py.in > test_gnunet_fs_rec.py
536 chmod +x test_gnunet_fs_rec.py 534 chmod +x test_gnunet_fs_rec.py
537 535
538test_gnunet_fs_ns.py: test_gnunet_fs_ns.py.in Makefile 536test_gnunet_fs_ns.py: test_gnunet_fs_ns.py.in Makefile
539 $(do_subst) < $(srcdir)/test_gnunet_fs_ns.py.in > test_gnunet_fs_ns.py 537 $(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_fs_ns.py.in > test_gnunet_fs_ns.py
540 chmod +x test_gnunet_fs_ns.py 538 chmod +x test_gnunet_fs_ns.py
541 539
542test_gnunet_fs_idx.py: test_gnunet_fs_idx.py.in Makefile 540test_gnunet_fs_idx.py: test_gnunet_fs_idx.py.in Makefile
543 $(do_subst) < $(srcdir)/test_gnunet_fs_idx.py.in > test_gnunet_fs_idx.py 541 $(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_fs_idx.py.in > test_gnunet_fs_idx.py
544 chmod +x test_gnunet_fs_idx.py 542 chmod +x test_gnunet_fs_idx.py
545 543
546 544
diff --git a/src/fs/test_gnunet_fs_idx.py.in b/src/fs/test_gnunet_fs_idx.py.in
index 2c8c7e8ec..564dd68f2 100755
--- a/src/fs/test_gnunet_fs_idx.py.in
+++ b/src/fs/test_gnunet_fs_idx.py.in
@@ -1,4 +1,4 @@
1#!@PYTHON@ 1#!@PYTHONEXE@
2# This file is part of GNUnet. 2# This file is part of GNUnet.
3# (C) 2010 Christian Grothoff (and other contributing authors) 3# (C) 2010 Christian Grothoff (and other contributing authors)
4# 4#
diff --git a/src/fs/test_gnunet_fs_psd.py.in b/src/fs/test_gnunet_fs_psd.py.in
index abb3d0b83..a25e4eaef 100755
--- a/src/fs/test_gnunet_fs_psd.py.in
+++ b/src/fs/test_gnunet_fs_psd.py.in
@@ -1,4 +1,4 @@
1#!@PYTHON@ 1#!@PYTHONEXE@
2# This file is part of GNUnet. 2# This file is part of GNUnet.
3# (C) 2010, 2018 Christian Grothoff (and other contributing authors) 3# (C) 2010, 2018 Christian Grothoff (and other contributing authors)
4# 4#
diff --git a/src/fs/test_gnunet_fs_rec.py.in b/src/fs/test_gnunet_fs_rec.py.in
index f827aa3a5..f7e84e3da 100755
--- a/src/fs/test_gnunet_fs_rec.py.in
+++ b/src/fs/test_gnunet_fs_rec.py.in
@@ -1,4 +1,4 @@
1#!@PYTHON@ 1#!@PYTHONEXE@
2# This file is part of GNUnet. 2# This file is part of GNUnet.
3# (C) 2010 Christian Grothoff (and other contributing authors) 3# (C) 2010 Christian Grothoff (and other contributing authors)
4# 4#
diff --git a/src/gns/Makefile.am b/src/gns/Makefile.am
index 9f0e0bbb6..abd5d5b48 100644
--- a/src/gns/Makefile.am
+++ b/src/gns/Makefile.am
@@ -103,17 +103,12 @@ plugin_LTLIBRARIES = \
103bin_SCRIPTS = \ 103bin_SCRIPTS = \
104 gnunet-gns-proxy-setup-ca 104 gnunet-gns-proxy-setup-ca
105 105
106# See: https://www.gnu.org/software/automake/manual/html_node/Scripts.html#Scripts
107do_subst = $(SED) -e 's,[@]pkgdatadir[@],$(pkgdatadir),g'
108
109gnunet-gns-proxy-setup-ca: gnunet-gns-proxy-setup-ca.in Makefile 106gnunet-gns-proxy-setup-ca: gnunet-gns-proxy-setup-ca.in Makefile
110 $(do_subst) < $(srcdir)/gnunet-gns-proxy-setup-ca.in > gnunet-gns-proxy-setup-ca 107 $(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)/gnunet-gns-proxy-setup-ca.in > gnunet-gns-proxy-setup-ca
111 @chmod +x gnunet-gns-proxy-setup-ca 108 @chmod +x gnunet-gns-proxy-setup-ca
112 109
113do_subst_pkgdatadir = $(SED) -e 's,[@]pkgdatadir[@],$(pkgdatadir),g'
114
115test_gnunet_gns.sh: test_gnunet_gns.sh.in Makefile 110test_gnunet_gns.sh: test_gnunet_gns.sh.in Makefile
116 $(do_subst_pkgdatadir) < $(srcdir)/test_gnunet_gns.sh.in > test_gnunet_gns.sh 111 $(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_gns.sh.in > test_gnunet_gns.sh
117 @chmod +x test_gnunet_gns.sh 112 @chmod +x test_gnunet_gns.sh
118 113
119CLEANFILES = test_gnunet_gns.sh 114CLEANFILES = test_gnunet_gns.sh
diff --git a/src/gns/gnunet-gns-proxy-setup-ca.in b/src/gns/gnunet-gns-proxy-setup-ca.in
index 7a79c7994..602aadb2a 100644
--- a/src/gns/gnunet-gns-proxy-setup-ca.in
+++ b/src/gns/gnunet-gns-proxy-setup-ca.in
@@ -48,30 +48,30 @@
48 48
49dir=$(dirname "$0") 49dir=$(dirname "$0")
50 50
51if test -e @pkgdatadir@/progname.sh 51if test -e @PKGDATADIRECTORY@/progname.sh
52then 52then
53 . @pkgdatadir@/progname.sh 53 . @PKGDATADIRECTORY@/progname.sh
54else 54else
55 . $dir/../../contrib/build-common/sh/lib.sh/progname.sh 55 . $dir/../../contrib/build-common/sh/lib.sh/progname.sh
56fi 56fi
57 57
58if test -e @pkgdatadir@/existence.sh 58if test -e @PKGDATADIRECTORY@/existence.sh
59then 59then
60 . @pkgdatadir@/existence.sh 60 . @PKGDATADIRECTORY@/existence.sh
61else 61else
62 . $dir/../../contrib/build-common/sh/lib.sh/existence.sh 62 . $dir/../../contrib/build-common/sh/lib.sh/existence.sh
63fi 63fi
64 64
65if test -e @pkgdatadir@/msg.sh 65if test -e @PKGDATADIRECTORY@/msg.sh
66then 66then
67 . @pkgdatadir@/msg.sh 67 . @PKGDATADIRECTORY@/msg.sh
68else 68else
69 . $dir/../../contrib/build-common/sh/lib.sh/msg.sh 69 . $dir/../../contrib/build-common/sh/lib.sh/msg.sh
70fi 70fi
71 71
72if test -e @pkgdatadir@/version_gnunet.sh 72if test -e @PKGDATADIRECTORY@/version_gnunet.sh
73then 73then
74 . @pkgdatadir@/version_gnunet.sh 74 . @PKGDATADIRECTORY@/version_gnunet.sh
75else 75else
76 . $dir/../../contrib/build-common/sh/lib.sh/version_gnunet.sh 76 . $dir/../../contrib/build-common/sh/lib.sh/version_gnunet.sh
77fi 77fi
@@ -143,8 +143,8 @@ generate_ca()
143 143
144 # ------------- openssl 144 # ------------- openssl
145 145
146 GNUTLS_CA_TEMPLATE=@pkgdatadir@/gnunet-gns-proxy-ca.template 146 GNUTLS_CA_TEMPLATE=@PKGDATADIRECTORY@/gnunet-gns-proxy-ca.template
147 OPENSSLCFG=@pkgdatadir@/openssl.cnf 147 OPENSSLCFG=@PKGDATADIRECTORY@/openssl.cnf
148 CERTTOOL="" 148 CERTTOOL=""
149 OPENSSL=0 149 OPENSSL=0
150 if test -x $(existence gnunet-certtool) 150 if test -x $(existence gnunet-certtool)
diff --git a/src/gns/test_gnunet_gns.sh.in b/src/gns/test_gnunet_gns.sh.in
index 66bed0516..8cdd062c7 100755
--- a/src/gns/test_gnunet_gns.sh.in
+++ b/src/gns/test_gnunet_gns.sh.in
@@ -8,9 +8,9 @@
8# but this works for now. 8# but this works for now.
9dir=$(dirname "$0") 9dir=$(dirname "$0")
10 10
11if test -e @pkgdatadir@/existence.sh 11if test -e @PKGDATADIRECTORY@/existence.sh
12then 12then
13 . @pkgdatadir@/existence.sh 13 . @PKGDATADIRECTORY@/existence.sh
14else 14else
15 . $dir/../../contrib/build-common/sh/lib.sh/existence.sh 15 . $dir/../../contrib/build-common/sh/lib.sh/existence.sh
16fi 16fi
@@ -22,7 +22,7 @@ fi
22$LOCATION --version 22$LOCATION --version
23if test $? != 0 23if test $? != 0
24then 24then
25 echo "GNUnet command line tools cannot be found, check environmental variables PATH and GNUNET_PREFIX" 25 echo "GNUnet command line tools cannot be found, check environmental variables PATH and GNUNET_PREFIX"
26 exit 77 26 exit 77
27fi 27fi
28 28
diff --git a/src/integration-tests/Makefile.am b/src/integration-tests/Makefile.am
index 8b50def4d..f456544db 100644
--- a/src/integration-tests/Makefile.am
+++ b/src/integration-tests/Makefile.am
@@ -36,43 +36,41 @@ endif
36endif 36endif
37endif 37endif
38 38
39do_subst = $(SED) -e 's,[@]PYTHON[@],$(PYTHON),g'
40
41SUFFIXES = .py.in .py 39SUFFIXES = .py.in .py
42.py.in.py: 40.py.in.py:
43 $(do_subst) < $(srcdir)/$< > $@ 41 $(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)/$< > $@
44 chmod +x $@ 42 chmod +x $@
45 43
46gnunet_testing.py: gnunet_testing.py.in Makefile 44gnunet_testing.py: gnunet_testing.py.in Makefile
47 $(do_subst) < $(srcdir)/gnunet_testing.py.in > gnunet_testing.py 45 $(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)/gnunet_testing.py.in > gnunet_testing.py
48 chmod +x gnunet_testing.py 46 chmod +x gnunet_testing.py
49 47
50gnunet_pyexpect.py: gnunet_pyexpect.py.in Makefile 48gnunet_pyexpect.py: gnunet_pyexpect.py.in Makefile
51 $(do_subst) < $(srcdir)/gnunet_pyexpect.py.in > gnunet_pyexpect.py 49 $(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)/gnunet_pyexpect.py.in > gnunet_pyexpect.py
52 chmod +x gnunet_pyexpect.py 50 chmod +x gnunet_pyexpect.py
53 51
54test_integration_bootstrap_and_connect.py: test_integration_bootstrap_and_connect.py.in Makefile 52test_integration_bootstrap_and_connect.py: test_integration_bootstrap_and_connect.py.in Makefile
55 $(do_subst) < $(srcdir)/test_integration_bootstrap_and_connect.py.in > test_integration_bootstrap_and_connect.py 53 $(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_integration_bootstrap_and_connect.py.in > test_integration_bootstrap_and_connect.py
56 chmod +x test_integration_bootstrap_and_connect.py 54 chmod +x test_integration_bootstrap_and_connect.py
57 55
58test_integration_disconnect.py: test_integration_disconnect.py.in Makefile 56test_integration_disconnect.py: test_integration_disconnect.py.in Makefile
59 $(do_subst) < $(srcdir)/test_integration_disconnect.py.in > test_integration_disconnect.py 57 $(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_integration_disconnect.py.in > test_integration_disconnect.py
60 chmod +x test_integration_disconnect.py 58 chmod +x test_integration_disconnect.py
61 59
62test_integration_disconnect_nat.py: test_integration_disconnect_nat.py.in Makefile 60test_integration_disconnect_nat.py: test_integration_disconnect_nat.py.in Makefile
63 $(do_subst) < $(srcdir)/test_integration_disconnect_nat.py.in > test_integration_disconnect_nat.py 61 $(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_integration_disconnect_nat.py.in > test_integration_disconnect_nat.py
64 chmod +x test_integration_disconnect_nat.py 62 chmod +x test_integration_disconnect_nat.py
65 63
66test_integration_reconnect.py: test_integration_reconnect.py.in Makefile 64test_integration_reconnect.py: test_integration_reconnect.py.in Makefile
67 $(do_subst) < $(srcdir)/test_integration_reconnect.py.in > test_integration_reconnect.py 65 $(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_integration_reconnect.py.in > test_integration_reconnect.py
68 chmod +x test_integration_reconnect.py 66 chmod +x test_integration_reconnect.py
69 67
70test_integration_reconnect_nat.py: test_integration_reconnect_nat.py.in Makefile 68test_integration_reconnect_nat.py: test_integration_reconnect_nat.py.in Makefile
71 $(do_subst) < $(srcdir)/test_integration_reconnect_nat.py.in > test_integration_reconnect_nat.py 69 $(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_integration_reconnect_nat.py.in > test_integration_reconnect_nat.py
72 chmod +x test_integration_reconnect_nat.py 70 chmod +x test_integration_reconnect_nat.py
73 71
74test_integration_clique.py: test_integration_clique.py.in Makefile 72test_integration_clique.py: test_integration_clique.py.in Makefile
75 $(do_subst) < $(srcdir)/test_integration_clique.py.in > test_integration_clique.py 73 $(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_integration_clique.py.in > test_integration_clique.py
76 chmod +x test_integration_clique.py 74 chmod +x test_integration_clique.py
77 75
78 76
diff --git a/src/integration-tests/gnunet_pyexpect.py.in b/src/integration-tests/gnunet_pyexpect.py.in
index aad84e4f7..b8ce52f00 100644
--- a/src/integration-tests/gnunet_pyexpect.py.in
+++ b/src/integration-tests/gnunet_pyexpect.py.in
@@ -1,4 +1,4 @@
1#!@PYTHON@ 1#!@PYTHONEXE@
2# This file is part of GNUnet. 2# This file is part of GNUnet.
3# (C) 2010 Christian Grothoff (and other contributing authors) 3# (C) 2010 Christian Grothoff (and other contributing authors)
4# 4#
diff --git a/src/integration-tests/gnunet_testing.py.in b/src/integration-tests/gnunet_testing.py.in
index 10f9d4475..828f6ff42 100644
--- a/src/integration-tests/gnunet_testing.py.in
+++ b/src/integration-tests/gnunet_testing.py.in
@@ -1,4 +1,4 @@
1#!@PYTHON@ 1#!@PYTHONEXE@
2# This file is part of GNUnet. 2# This file is part of GNUnet.
3# (C) 2010, 2017, 2018 Christian Grothoff (and other contributing authors) 3# (C) 2010, 2017, 2018 Christian Grothoff (and other contributing authors)
4# 4#
diff --git a/src/integration-tests/test_integration_bootstrap_and_connect.py.in b/src/integration-tests/test_integration_bootstrap_and_connect.py.in
index ddac326cd..441523dfe 100755
--- a/src/integration-tests/test_integration_bootstrap_and_connect.py.in
+++ b/src/integration-tests/test_integration_bootstrap_and_connect.py.in
@@ -1,4 +1,4 @@
1#!@PYTHON@ 1#!@PYTHONEXE@
2# This file is part of GNUnet. 2# This file is part of GNUnet.
3# (C) 2010, 2018 Christian Grothoff (and other contributing authors) 3# (C) 2010, 2018 Christian Grothoff (and other contributing authors)
4# 4#
diff --git a/src/integration-tests/test_integration_clique.py.in b/src/integration-tests/test_integration_clique.py.in
index a23c025ca..65df632f0 100755
--- a/src/integration-tests/test_integration_clique.py.in
+++ b/src/integration-tests/test_integration_clique.py.in
@@ -1,4 +1,4 @@
1#!@PYTHON@ 1#!@PYTHONEXE@
2# This file is part of GNUnet. 2# This file is part of GNUnet.
3# (C) 2010, 2018 Christian Grothoff (and other contributing authors) 3# (C) 2010, 2018 Christian Grothoff (and other contributing authors)
4# 4#
diff --git a/src/integration-tests/test_integration_disconnect.py.in b/src/integration-tests/test_integration_disconnect.py.in
index 9861728c2..c942042c4 100755
--- a/src/integration-tests/test_integration_disconnect.py.in
+++ b/src/integration-tests/test_integration_disconnect.py.in
@@ -1,4 +1,4 @@
1#!@PYTHON@ 1#!@PYTHONEXE@
2# This file is part of GNUnet. 2# This file is part of GNUnet.
3# (C) 2010, 2017 Christian Grothoff (and other contributing authors) 3# (C) 2010, 2017 Christian Grothoff (and other contributing authors)
4# 4#
diff --git a/src/integration-tests/test_integration_disconnect_nat.py.in b/src/integration-tests/test_integration_disconnect_nat.py.in
index d3ff84ebe..2f10818cc 100755
--- a/src/integration-tests/test_integration_disconnect_nat.py.in
+++ b/src/integration-tests/test_integration_disconnect_nat.py.in
@@ -1,4 +1,4 @@
1#!@PYTHON@ 1#!@PYTHONEXE@
2# This file is part of GNUnet. 2# This file is part of GNUnet.
3# (C) 2010, 2018 Christian Grothoff (and other contributing authors) 3# (C) 2010, 2018 Christian Grothoff (and other contributing authors)
4# 4#
diff --git a/src/integration-tests/test_integration_reconnect.py.in b/src/integration-tests/test_integration_reconnect.py.in
index 5bffb72e3..97dc94502 100755
--- a/src/integration-tests/test_integration_reconnect.py.in
+++ b/src/integration-tests/test_integration_reconnect.py.in
@@ -1,4 +1,4 @@
1#!@PYTHON@ 1#!@PYTHONEXE@
2# This file is part of GNUnet. 2# This file is part of GNUnet.
3# (C) 2010, 2017 Christian Grothoff (and other contributing authors) 3# (C) 2010, 2017 Christian Grothoff (and other contributing authors)
4# 4#
diff --git a/src/integration-tests/test_integration_reconnect_nat.py.in b/src/integration-tests/test_integration_reconnect_nat.py.in
index 751a0484b..7624e7b38 100755
--- a/src/integration-tests/test_integration_reconnect_nat.py.in
+++ b/src/integration-tests/test_integration_reconnect_nat.py.in
@@ -1,4 +1,4 @@
1#!@PYTHON@ 1#!@PYTHONEXE@
2# This file is part of GNUnet. 2# This file is part of GNUnet.
3# (C) 2010, 2018 Christian Grothoff (and other contributing authors) 3# (C) 2010, 2018 Christian Grothoff (and other contributing authors)
4# 4#
diff --git a/src/peerinfo-tool/Makefile.am b/src/peerinfo-tool/Makefile.am
index 8a2efba63..05173d551 100644
--- a/src/peerinfo-tool/Makefile.am
+++ b/src/peerinfo-tool/Makefile.am
@@ -56,10 +56,8 @@ AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PAT
56TESTS = $(check_SCRIPTS) 56TESTS = $(check_SCRIPTS)
57endif 57endif
58 58
59do_subst = $(SED) -e 's,[@]PYTHON[@],$(PYTHON),g'
60
61test_gnunet_peerinfo.py: test_gnunet_peerinfo.py.in Makefile 59test_gnunet_peerinfo.py: test_gnunet_peerinfo.py.in Makefile
62 $(do_subst) < $(srcdir)/test_gnunet_peerinfo.py.in > test_gnunet_peerinfo.py 60 $(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_peerinfo.py.in > test_gnunet_peerinfo.py
63 chmod +x test_gnunet_peerinfo.py 61 chmod +x test_gnunet_peerinfo.py
64 62
65EXTRA_DIST = \ 63EXTRA_DIST = \
diff --git a/src/peerinfo-tool/test_gnunet_peerinfo.py.in b/src/peerinfo-tool/test_gnunet_peerinfo.py.in
index 5d9daa930..9a87d3649 100755
--- a/src/peerinfo-tool/test_gnunet_peerinfo.py.in
+++ b/src/peerinfo-tool/test_gnunet_peerinfo.py.in
@@ -1,4 +1,4 @@
1#!@PYTHON@ 1#!@PYTHONEXE@
2# This file is part of GNUnet. 2# This file is part of GNUnet.
3# (C) 2010, 2018 Christian Grothoff (and other contributing authors) 3# (C) 2010, 2018 Christian Grothoff (and other contributing authors)
4# 4#
diff --git a/src/revocation/Makefile.am b/src/revocation/Makefile.am
index 5e48fb29f..b3b2877ca 100644
--- a/src/revocation/Makefile.am
+++ b/src/revocation/Makefile.am
@@ -90,10 +90,8 @@ if ENABLE_TEST_RUN
90 $(check_PROGRAMS) 90 $(check_PROGRAMS)
91endif 91endif
92 92
93do_subst = $(SED) -e 's,[@]PYTHON[@],$(PYTHON),g'
94
95test_local_revocation.py: test_local_revocation.py.in Makefile 93test_local_revocation.py: test_local_revocation.py.in Makefile
96 $(do_subst) < $(srcdir)/test_local_revocation.py.in > test_local_revocation.py 94 $(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_local_revocation.py.in > test_local_revocation.py
97 chmod +x test_local_revocation.py 95 chmod +x test_local_revocation.py
98 96
99EXTRA_DIST = test_revocation.conf \ 97EXTRA_DIST = test_revocation.conf \
diff --git a/src/revocation/test_local_revocation.py.in b/src/revocation/test_local_revocation.py.in
index d73d0a869..e667c10ce 100644
--- a/src/revocation/test_local_revocation.py.in
+++ b/src/revocation/test_local_revocation.py.in
@@ -1,4 +1,4 @@
1#!@PYTHON@ 1#!@PYTHONEXE@
2# This file is part of GNUnet. 2# This file is part of GNUnet.
3# (C) 2010, 2018 Christian Grothoff (and other contributing authors) 3# (C) 2010, 2018 Christian Grothoff (and other contributing authors)
4# 4#
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 = \
84 test_gnunet_statistics.py 84 test_gnunet_statistics.py
85endif 85endif
86 86
87do_subst = $(SED) -e 's,[@]PYTHON[@],$(PYTHON),g'
88
89SUFFIXES = .py.in .py 87SUFFIXES = .py.in .py
90.py.in.py: 88.py.in.py:
91 $(do_subst) < $(srcdir)/$< > $@ 89 $(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)/$< > $@
92 chmod +x $@ 90 chmod +x $@
93 91
94test_gnunet_statistics.py: test_gnunet_statistics.py.in Makefile 92test_gnunet_statistics.py: test_gnunet_statistics.py.in Makefile
95 $(do_subst) < $(srcdir)/test_gnunet_statistics.py.in > test_gnunet_statistics.py 93 $(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
96 chmod +x test_gnunet_statistics.py 94 chmod +x test_gnunet_statistics.py
97 95
98EXTRA_DIST = \ 96EXTRA_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 @@
1#!@PYTHON@ 1#!@PYTHONEXE@
2 2
3import os 3import os
4import sys 4import sys
diff --git a/src/transport/gnunet-transport-certificate-creation.in b/src/transport/gnunet-transport-certificate-creation.in
index 1c04089a4..8348dd1b7 100644
--- a/src/transport/gnunet-transport-certificate-creation.in
+++ b/src/transport/gnunet-transport-certificate-creation.in
@@ -101,9 +101,9 @@ generate_cert_key()
101{ 101{
102 echo "" 102 echo ""
103 infomsg "Generating Cert and Key" 103 infomsg "Generating Cert and Key"
104 104
105 CERTTOOL="" 105 CERTTOOL=""
106 GNUTLS_CA_TEMPLATE=@pkgdatadir@/gnunet-gns-proxy-ca.template 106 GNUTLS_CA_TEMPLATE=@PKGDATADIRECTORY@/gnunet-gns-proxy-ca.template
107 OPENSSL=0 107 OPENSSL=0
108 if test -z "`gnutls-certtool --version`" > /dev/null 108 if test -z "`gnutls-certtool --version`" > /dev/null
109 then 109 then