From: Teemu Ikonen <tpikonen@gmail.com>
Date: Sat, 19 Nov 2011 19:17:15 +0000 (+0100)
Subject: Merge branch 'master' into debian
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=096d7a77ed59b78fef52767fb9165e47339d8cbf;p=packages%2Fb%2Fbup.git

Merge branch 'master' into debian
---

096d7a77ed59b78fef52767fb9165e47339d8cbf
diff --cc Makefile
index 1160d91,ce91ff0..3738be0
--- a/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 \