diff options
author | ng0 <ng0@n0.is> | 2019-12-02 17:34:07 +0000 |
---|---|---|
committer | ng0 <ng0@n0.is> | 2019-12-02 17:34:07 +0000 |
commit | 339d7a7d8ca789f9777501c3092e5c7ea0c4850a (patch) | |
tree | 5110bf9188f3c0c6d102cd4bf45d2325a5ff4136 /src/dht | |
parent | 79ff68acae7e4774881d6bc53fc5c639da4a2e7b (diff) | |
parent | fdf8c95a33fe6c81c93cd17ed7a38b8b55df7d54 (diff) | |
download | gnunet-netbsd-support.tar.gz gnunet-netbsd-support.zip |
Merge branch 'master' into netbsd-supportnetbsd-support
Diffstat (limited to 'src/dht')
-rw-r--r-- | src/dht/Makefile.am | 8 | ||||
-rw-r--r-- | src/dht/test_dht_tools.py.in | 4 |
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 = \ | |||
220 | test_dht_tools.py | 220 | test_dht_tools.py |
221 | endif | 221 | endif |
222 | 222 | ||
223 | do_subst = $(SED) -e 's,[@]PYTHON[@],$(PYTHON),g' -e 's,[@]bindir[@],$(bindir),g' | ||
224 | |||
225 | SUFFIXES = .py.in .py | 223 | SUFFIXES = .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 | |||
230 | test_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 | |||
20 | import time | 20 | import time |
21 | import tempfile | 21 | import tempfile |
22 | 22 | ||
23 | os.environ["PATH"] = "@bindir@" + ":" + os.environ["PATH"] | 23 | os.environ["PATH"] = "@bindirectory@" + ":" + os.environ["PATH"] |
24 | 24 | ||
25 | if os.name == "nt": | 25 | if os.name == "nt": |
26 | tmp = os.getenv("TEMP") | 26 | tmp = os.getenv("TEMP") |