X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Makefile;h=c4e74b59ed94e5c279b2f4a7f891f53fe3a8ce6b;hb=4f7e4dfcdc5b12efb809a2cafcfff6fbd7e569a0;hp=d285f3ac71e3e7083679653e77fe5f21a829af82;hpb=3fa656946d28bb8cac061b745e2edc26bc2d56ae;p=bup.git

diff --git a/Makefile b/Makefile
index d285f3a..c4e74b5 100644
--- a/Makefile
+++ b/Makefile
@@ -57,6 +57,15 @@ all: $(bup_deps) Documentation/all $(current_sampledata)
 $(current_sampledata):
 	t/configure-sampledata --setup
 
+
+bup_libdir="$script_home/../lib"  # bup_libdir will be adjusted during install
+
+define install-bup-python
+  set -e; \
+  sed -e 's|.*# bup_libdir will be adjusted during install|bup_libdir="$$script_home/.."|' $1 > $2; \
+  chmod 0755 $2;
+endef
+
 PANDOC ?= $(shell type -p pandoc)
 
 ifeq (,$(PANDOC))
@@ -91,6 +100,7 @@ install: all
 	test -z "$(man_html)" || $(INSTALL) -m 0644 $(man_html) $(dest_docdir)
 	$(INSTALL) -pm 0755 cmd/bup $(dest_libdir)/cmd/
 	$(INSTALL) -pm 0755 cmd/bup-* $(dest_libdir)/cmd/
+	$(call install-bup-python,cmd/bup-python,"$(dest_libdir)/cmd/bup-python")
 	cd "$(dest_bindir)" && \
 	  ln -sf "$$($(bup_python) -c 'import os; print(os.path.relpath("$(abspath $(dest_libdir))/cmd/bup"))')"
 	set -e; \
@@ -134,7 +144,9 @@ t/tmp:
 runtests: runtests-python runtests-cmdline
 
 python_tests := \
+  lib/bup/t/tbloom.py \
   lib/bup/t/thashsplit.py \
+  lib/bup/t/tindex.py \
   lib/bup/t/toptions.py \
   lib/bup/t/tshquote.py \
   lib/bup/t/tvint.py \
@@ -142,11 +154,9 @@ python_tests := \
 
 ifeq "2" "$(bup_python_majver)"
   python_tests += \
-    lib/bup/t/tbloom.py \
     lib/bup/t/tclient.py \
     lib/bup/t/tgit.py \
     lib/bup/t/thelpers.py \
-    lib/bup/t/tindex.py \
     lib/bup/t/tmetadata.py \
     lib/bup/t/tresolve.py \
     lib/bup/t/tvfs.py
@@ -165,6 +175,7 @@ cmdline_tests :=
 
 ifeq "2" "$(bup_python_majver)"
   cmdline_tests += \
+    t/test-argv \
     t/test-ftp \
     t/test-save-restore \
     t/test-packsizelimit \
@@ -246,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
-	head -n -1 $< > "$@".$$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 "$@"
 
@@ -312,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 \