vfs: accommodate python 3

[bup.git] / Makefile

diff --git a/Makefile b/Makefile
index 87e78fab1731ec7fe72096cff444273c06c7320d..037203f0973efc23a0d90afc43bb7f6e5ae65f53 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -145,7 +145,9 @@ runtests: runtests-python runtests-cmdline
 
 python_tests := \
   lib/bup/t/tbloom.py \
+  lib/bup/t/tgit.py \
   lib/bup/t/thashsplit.py \
+  lib/bup/t/thelpers.py \
   lib/bup/t/tindex.py \
   lib/bup/t/toptions.py \
   lib/bup/t/tshquote.py \
@@ -155,8 +157,6 @@ python_tests := \
 ifeq "2" "$(bup_python_majver)"
   python_tests += \
     lib/bup/t/tclient.py \
-    lib/bup/t/tgit.py \
-    lib/bup/t/thelpers.py \
     lib/bup/t/tmetadata.py \
     lib/bup/t/tresolve.py \
     lib/bup/t/tvfs.py
@@ -258,7 +258,7 @@ distcheck: all
        ./wvtest run t/test-release-archive.sh
 
 cmd/bup-python: cmd/python-cmd.sh config/config.var/bup-python
-       dev/replace -l '@bup_python@' \
+       "$$(cat config/config.var/bup-python)" dev/replace -l '@bup_python@' \
          "$$(dev/shquote < config/config.var/bup-python)" \
          < "$<" > "$@".$$PPID.tmp
        chmod +x "$@".$$PPID.tmp