Merge branch 'master' into debian

diff --cc Makefile
index 1160d91326443afc49d68a213134d3697ff20d50,ce91ff0172451b167f76db86ad13cc8aa207bdf1..3738be0f00e298f4f86fe9aaa57b517b74fb0c31
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -16,13 -16,14 +16,14 @@@ Documentation/all: bu
  
  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 \
 +              $(LIBDIR)/bup $(LIBDIR)/cmd \
                $(LIBDIR)/web $(LIBDIR)/web/static
        [ ! -e Documentation/.docs-available ] || \
          $(INSTALL) -m 0644 \