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/consensus | |
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/consensus')
-rw-r--r-- | src/consensus/Makefile.am | 4 | ||||
-rw-r--r-- | src/consensus/consensus-simulation.py.in | 2 |
2 files changed, 2 insertions, 4 deletions
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 |
24 | endif | 24 | endif |
25 | 25 | ||
26 | do_subst = $(SED) -e 's,[@]PYTHON[@],$(PYTHON),g' | ||
27 | |||
28 | SUFFIXES = .py.in .py | 26 | SUFFIXES = .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 | ||
34 | check-python-style: | 32 | check-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 | # |