X-Git-Url: https://arthur.barton.de/gitweb/?a=blobdiff_plain;f=Makefile;h=410613f793983211facb0938fe97f7f4b7496e36;hb=c8d029faa649add017ba13755fb3e03c3975d204;hp=b2f337ab5602b64207217d636a6a0deb1c511cac;hpb=973a680f7134c1d6a4b9cfb21dd977c445fa5cd6;p=bup.git

diff --git a/Makefile b/Makefile
index b2f337a..410613f 100644
--- a/Makefile
+++ b/Makefile
@@ -44,7 +44,7 @@ initial_setup := $(call shout,$(initial_setup),Version configuration failed))
 
 config/config.vars: configure config/configure config/configure.inc \
   $(wildcard config/*.in)
-	./configure
+	MAKE="$(MAKE)" ./configure
 
 bup_cmds := cmd/bup-python\
   $(patsubst cmd/%-cmd.py,cmd/bup-%,$(wildcard cmd/*-cmd.py)) \
@@ -79,42 +79,42 @@ man_roff := $(patsubst %.md,%.1,$(man_md))
 man_html := $(patsubst %.md,%.html,$(man_md))
 
 INSTALL=install
-PREFIX=/usr
-MANDIR=$(DESTDIR)$(PREFIX)/share/man
-DOCDIR=$(DESTDIR)$(PREFIX)/share/doc/bup
-BINDIR=$(DESTDIR)$(PREFIX)/bin
-LIBDIR=$(DESTDIR)$(PREFIX)/lib/bup
+PREFIX=/usr/local
+MANDIR=$(PREFIX)/share/man
+DOCDIR=$(PREFIX)/share/doc/bup
+BINDIR=$(PREFIX)/bin
+LIBDIR=$(PREFIX)/lib/bup
+
+dest_mandir := $(DESTDIR)$(MANDIR)
+dest_docdir := $(DESTDIR)$(DOCDIR)
+dest_bindir := $(DESTDIR)$(BINDIR)
+dest_libdir := $(DESTDIR)$(LIBDIR)
 
 install: all
-	$(INSTALL) -d $(BINDIR) \
-		$(LIBDIR)/bup $(LIBDIR)/cmd \
-		$(LIBDIR)/web $(LIBDIR)/web/static
-	test -z "$(man_roff)" || install -d $(MANDIR)/man1
-	test -z "$(man_roff)" || $(INSTALL) -m 0644 $(man_roff) $(MANDIR)/man1
-	test -z "$(man_html)" || install -d $(DOCDIR)
-	test -z "$(man_html)" || $(INSTALL) -m 0644 $(man_html) $(DOCDIR)
-	$(call install-python-bin,bup,"$(BINDIR)/bup")
+	$(INSTALL) -d $(dest_bindir) \
+		$(dest_libdir)/bup $(dest_libdir)/cmd \
+		$(dest_libdir)/web $(dest_libdir)/web/static
+	test -z "$(man_roff)" || install -d $(dest_mandir)/man1
+	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")
 	set -e; \
 	for cmd in $$(ls cmd/bup-* | grep -v cmd/bup-python); do \
-	  $(call install-python-bin,"$$cmd","$(LIBDIR)/$$cmd") \
+	  $(call install-python-bin,"$$cmd","$(dest_libdir)/$$cmd") \
 	done
 	$(INSTALL) -pm 0644 \
 		lib/bup/*.py \
-		$(LIBDIR)/bup
+		$(dest_libdir)/bup
 	$(INSTALL) -pm 0755 \
 		lib/bup/*$(SOEXT) \
-		$(LIBDIR)/bup
+		$(dest_libdir)/bup
 	$(INSTALL) -pm 0644 \
 		lib/web/static/* \
-		$(LIBDIR)/web/static/
+		$(dest_libdir)/web/static/
 	$(INSTALL) -pm 0644 \
 		lib/web/*.html \
-		$(LIBDIR)/web/
-%/all:
-	$(MAKE) -C $* all
-
-%/clean:
-	$(MAKE) -C $* clean
+		$(dest_libdir)/web/
 
 config/config.h: config/config.vars
 
@@ -145,6 +145,8 @@ runtests-python: all t/tmp
 	    | tee -a t/tmp/test-log/$$$$.log
 
 cmdline_tests := \
+  t/test-main.sh \
+  t/test-list-idx.sh \
   t/test-index.sh \
   t/test-split-join.sh \
   t/test-fuse.sh \
@@ -188,7 +190,8 @@ stupid:
 test: all
 	if test -e t/tmp/test-log; then rm -r t/tmp/test-log; fi
 	mkdir -p t/tmp/test-log
-	./wvtest watch --no-counts $(MAKE) runtests-python runtests-cmdline
+	./wvtest watch --no-counts \
+	  $(MAKE) runtests-python runtests-cmdline 2>t/tmp/test-log/$$$$.log
 	./wvtest report t/tmp/test-log/*.log
 
 check: test
@@ -256,12 +259,13 @@ import-docs: Documentation/clean
 	$(pf); git archive origin/html | (cd Documentation && tar -xvf -)
 	$(pf); git archive origin/man | (cd Documentation && tar -xvf -)
 
-clean: Documentation/clean config/clean
+clean: Documentation/clean cmd/bup-python
+	cd config && rm -f *~ .*~ \
+	  ${CONFIGURE_DETRITUS} ${CONFIGURE_FILES} ${GENERATED_FILES}
 	rm -f *.o lib/*/*.o *.so lib/*/*.so *.dll lib/*/*.dll *.exe \
 		.*~ *~ */*~ lib/*/*~ lib/*/*/*~ \
 		*.pyc */*.pyc lib/*/*.pyc lib/*/*/*.pyc \
-		bup bup-* cmd/bup-* \
-		cmd/python-cmd.sh \
+		bup bup-* \
 		randomgen memtest \
 		testfs.img lib/bup/t/testfs.img
 	if test -e t/mnt; then t/cleanup-mounts-under t/mnt; fi
@@ -274,3 +278,5 @@ clean: Documentation/clean config/clean
 	if test -e t/tmp; then t/force-delete t/tmp; fi
 	./configure-version --clean
 	t/configure-sampledata --clean
+        # Remove last so that cleanup tools can depend on it
+	rm -f cmd/bup-* cmd/python-cmd.sh