Fix bug reported by schanzen@ where bootstrap is not enough for our python2.7 script.

2 files changed, 6 insertions, 3 deletions

diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index 1e82ec73a..0ba06f4bb 100644
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -225,10 +225,13 @@ gnunet_timeout_SOURCES = \
  gnunet-timeout-w32.c
 endif
 
+# This is horrible, but compared to the alternatives and the solution
+# which preceded this it is a good compromise and good enough for one
+# file. Everyone else is invited to patch it locally.
 
-mypython27=$(shell cat $(top_srcdir)/src/util/python27_location)
+xENV=$(shell which env)
 
-do_subst = $(SED) -e 's,[@]PYTHON2[@],${mypython27},g'
+do_subst = $(SED) -e 's,[@]ENV[@],${xENV},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 0d52bed53..ceed8bd77 100755
--- a/src/util/gnunet-qr.py.in
+++ b/src/util/gnunet-qr.py.in
@@ -1,4 +1,4 @@
-#!@PYTHON2@
+#!@ENV@ python2.7
 from __future__ import print_function
 from builtins import str
 import sys