Add *.tmp.meta to .gitignore and to "make clean".

[bup.git] / Makefile

diff --git a/Makefile b/Makefile
index 8558c772246bb9cf463b32a5a32c03b03d2c411e..ccecfc68ef9ed9683871db493c83bc93658c8ef1 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -16,10 +16,11 @@ Documentation/all: bup
 
 INSTALL=install
 PYTHON=python
-MANDIR=$(DESTDIR)/usr/share/man
-DOCDIR=$(DESTDIR)/usr/share/doc/bup
-BINDIR=$(DESTDIR)/usr/bin
-LIBDIR=$(DESTDIR)/usr/lib/bup
+PREFIX=/usr
+MANDIR=$(DESTDIR)$(PREFIX)/share/man
+DOCDIR=$(DESTDIR)$(PREFIX)/share/doc/bup
+BINDIR=$(DESTDIR)$(PREFIX)/bin
+LIBDIR=$(DESTDIR)$(PREFIX)/lib/bup
 install: all
        $(INSTALL) -d $(MANDIR)/man1 $(DOCDIR) $(BINDIR) \
                $(LIBDIR)/bup $(LIBDIR)/cmd $(LIBDIR)/tornado \
@@ -56,10 +57,10 @@ install: all
 
 %/clean:
        $(MAKE) -C $* clean
-       
+
 config/config.h: config/Makefile config/configure config/configure.inc \
                $(wildcard config/*.in)
-       cd config && make config.h
+       cd config && $(MAKE) config.h
 
 lib/bup/_helpers$(SOEXT): \
                config/config.h \
@@ -78,7 +79,10 @@ lib/bup/_version.py:
 runtests: all runtests-python runtests-cmdline
 
 runtests-python:
-       $(PYTHON) wvtest.py t/t*.py lib/*/t/t*.py
+       $(PYTHON) wvtest.py \
+               $(wildcard t/t*.py) \
+               $(filter-out lib/bup/t/tmetadata.py,$(wildcard lib/*/t/t*.py))
+       $(PYTHON) wvtest.py lib/bup/t/tmetadata.py
 
 runtests-cmdline: all
        t/test.sh
@@ -145,15 +149,17 @@ import-docs: Documentation/clean
        git archive origin/html | (cd Documentation; tar -xvf -)
        git archive origin/man | (cd Documentation; tar -xvf -)
 
-# tgit.py plays with permissions on lib/bup/t/pybuptest.tmp, so we should
-# ensure that we can delete the directory before doing it.
-clean: Documentation/clean
-       rm -f *.o lib/*/*.o *.so lib/*/*.so *.dll *.exe \
+clean: Documentation/clean config/clean
+       rm -f *.o lib/*/*.o *.so lib/*/*.so *.dll lib/*/*.dll *.exe \
                .*~ *~ */*~ lib/*/*~ lib/*/*/*~ \
                *.pyc */*.pyc lib/*/*.pyc lib/*/*/*.pyc \
                bup bup-* cmd/bup-* lib/bup/_version.py randomgen memtest \
                out[12] out2[tc] tags[12] tags2[tc] \
                testfs.img lib/bup/t/testfs.img
-       rm -rf *.tmp t/*.tmp lib/*/*/*.tmp build lib/bup/build
-       if test -e testfs; then rmdir testfs; fi
-       if test -e lib/bup/t/testfs; then rmdir lib/bup/t/testfs; fi
+       if test -e bupmeta.tmp/testfs; \
+         then umount bupmeta.tmp/testfs || true; fi
+       if test -e lib/bup/t/testfs; \
+         then umount lib/bup/t/testfs || true; fi
+       if test -e bupmeta.tmp/testfs-limited; \
+         then umount bupmeta.tmp/testfs-limited || true; fi
+       rm -rf *.tmp *.tmp.meta t/*.tmp lib/*/*/*.tmp build lib/bup/build lib/bup/t/testfs