git: remove unused _git_capture()

[bup.git] / Makefile

diff --git a/Makefile b/Makefile
index 9f111000c06da7997c7f1b9fb88d1e61c6ef696a..edf6f658df7a4f69df3551cc4e5b156cf07e7083 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -145,8 +145,11 @@ 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/tmetadata.py \
   lib/bup/t/toptions.py \
   lib/bup/t/tshquote.py \
   lib/bup/t/tvint.py \
@@ -155,9 +158,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
 endif
@@ -257,9 +257,10 @@ check: test
 distcheck: all
        ./wvtest run t/test-release-archive.sh
 
-cmd/bup-python: cmd/python-cmd.sh config/config.vars Makefile
-       sed -e '$$ d' $< > "$@".$$PPID.tmp
-       printf "exec %q \"\$$@\"\n" "$(bup_python)" >> "$@".$$PPID.tmp
+cmd/bup-python: cmd/python-cmd.sh config/config.var/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
        mv "$@".$$PPID.tmp "$@"
 
@@ -323,6 +324,7 @@ import-docs: Documentation/clean
 clean: Documentation/clean cmd/bup-python
        cd config && rm -f *~ .*~ \
          ${CONFIGURE_DETRITUS} ${CONFIGURE_FILES} ${GENERATED_FILES}
+       cd config && rm -rf config.var
        rm -f *.o lib/*/*.o *.so lib/*/*.so *.dll lib/*/*.dll *.exe \
                .*~ *~ */*~ lib/*/*~ lib/*/*/*~ \
                *.pyc */*.pyc lib/*/*.pyc lib/*/*/*.pyc \