From: Robert S. Edmonds <edmonds@debian.org>
Date: Tue, 10 Dec 2013 19:42:10 +0000 (-0500)
Subject: Merge tag '0.25-rc5' into debian
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=cdfbf735c7392feb65f22827ecdc3c3ceb2debe8;p=packages%2Fb%2Fbup.git

Merge tag '0.25-rc5' into debian

0.25-rc5
---

cdfbf735c7392feb65f22827ecdc3c3ceb2debe8
diff --cc Makefile
index 1978c46,5c0cf6c..de676a6
--- a/Makefile
+++ b/Makefile
@@@ -6,9 -6,15 +6,15 @@@ ifeq ($(OS),CYGWIN
    SOEXT:=.dll
  endif
  
+ ifdef TMPDIR
+   test_tmp := $(TMPDIR)
+ else
+   test_tmp := $(CURDIR)/t/tmp
+ endif
+ 
  default: all
  
 -all: bup Documentation/all
 +all: bup
  	t/configure-sampledata --setup
  
  bup: lib/bup/_version.py lib/bup/_helpers$(SOEXT) cmds