X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Makefile;h=87e78fab1731ec7fe72096cff444273c06c7320d;hb=bf478211a7b79eb5165f62792f1d739492b9311a;hp=a9ddbd15b106f20e6d15ab042964b3c863bc0222;hpb=ef1fb5b7593dfa3694f3bb737c168e402f8c912e;p=bup.git

diff --git a/Makefile b/Makefile
index a9ddbd1..87e78fa 100644
--- a/Makefile
+++ b/Makefile
@@ -50,19 +50,19 @@ bup_cmds := cmd/bup-python \
   $(patsubst cmd/%-cmd.py,cmd/bup-%,$(wildcard cmd/*-cmd.py)) \
   $(patsubst cmd/%-cmd.sh,cmd/bup-%,$(wildcard cmd/*-cmd.sh))
 
-bup_deps := bup lib/bup/_checkout.py lib/bup/_helpers$(SOEXT) $(bup_cmds)
+bup_deps := lib/bup/_checkout.py lib/bup/_helpers$(SOEXT) $(bup_cmds)
 
 all: $(bup_deps) Documentation/all $(current_sampledata)
 
-bup:
-	ln -s main.py bup
-
 $(current_sampledata):
 	t/configure-sampledata --setup
 
-define install-python-bin
+
+bup_libdir="$script_home/../lib"  # bup_libdir will be adjusted during install
+
+define install-bup-python
   set -e; \
-  sed -e '1 s|.*|#!$(bup_python)|; 2,/^# end of bup preamble$$/d' $1 > $2; \
+  sed -e 's|.*# bup_libdir will be adjusted during install|bup_libdir="$$script_home/.."|' $1 > $2; \
   chmod 0755 $2;
 endef
 
@@ -98,8 +98,12 @@ install: all
 	test -z "$(man_roff)" || $(INSTALL) -m 0644 $(man_roff) $(dest_mandir)/man1
 	test -z "$(man_html)" || install -d $(dest_docdir)
 	test -z "$(man_html)" || $(INSTALL) -m 0644 $(man_html) $(dest_docdir)
-	$(call install-python-bin,bup,"$(dest_bindir)/bup")
+	$(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; \
 	$(INSTALL) -pm 0644 \
 		lib/bup/*.py \
 		$(dest_libdir)/bup
@@ -140,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 \
@@ -148,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
@@ -164,13 +168,14 @@ endif
 runtests-python: all t/tmp
 	mkdir -p t/tmp/test-log
 	$(pf); cd $$(pwd -P); TMPDIR="$(test_tmp)" \
-	  "$(bup_python)" wvtest.py  $(python_tests) 2>&1 \
+	  ./wvtest.py  $(python_tests) 2>&1 \
 	    | tee -a t/tmp/test-log/$$$$.log
 
 cmdline_tests :=
 
 ifeq "2" "$(bup_python_majver)"
   cmdline_tests += \
+    t/test-argv \
     t/test-ftp \
     t/test-save-restore \
     t/test-packsizelimit \
@@ -252,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
+	dev/replace -l '@bup_python@' \
+	  "$$(dev/shquote < config/config.var/bup-python)" \
+	  < "$<" > "$@".$$PPID.tmp
 	chmod +x "$@".$$PPID.tmp
 	mv "$@".$$PPID.tmp "$@"
 
@@ -318,10 +324,10 @@ 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 \
-		bup \
 		randomgen memtest \
 		testfs.img lib/bup/t/testfs.img
 	for x in $$(ls cmd/*-cmd.py cmd/*-cmd.sh | grep -vF python-cmd.sh | cut -b 5-); do \