Switch to python3.7 (integration-tests incomplete), continue using python2.7 for gnunet-qr with an incredible annoying workaround for autotools inability to deal with 2 major python versions at the same time

Signed-off-by: ng0 <ng0@n0.is>

3 files changed, 5 insertions, 2 deletions

diff --git a/src/util/.gitignore b/src/util/.gitignore
index 7b190ca76..dfa6c7947 100644
--- a/src/util/.gitignore
+++ b/src/util/.gitignore
@@ -73,3 +73,4 @@ test_hexcoder
 test_regex
 test_tun
 gnunet-timeout
+python27_location
diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index fd00b077d..1e82ec73a 100644
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -226,7 +226,9 @@ gnunet_timeout_SOURCES = \
 endif
 
 
-do_subst = $(SED) -e 's,[@]PYTHON[@],$(PYTHON),g'
+mypython27=$(shell cat $(top_srcdir)/src/util/python27_location)
+
+do_subst = $(SED) -e 's,[@]PYTHON2[@],${mypython27},g'
 
 gnunet-qr: gnunet-qr.py.in Makefile
         $(do_subst) < $(top_srcdir)/src/util/gnunet-qr.py.in > gnunet-qr
diff --git a/src/util/gnunet-qr.py.in b/src/util/gnunet-qr.py.in
index 6c9d208f7..0d52bed53 100755
--- a/src/util/gnunet-qr.py.in
+++ b/src/util/gnunet-qr.py.in
@@ -1,4 +1,4 @@
-#!@PYTHON@
+#!@PYTHON2@
 from __future__ import print_function
 from builtins import str
 import sys