From: Avery Pennarun <apenwarr@gmail.com>
Date: Sun, 20 Mar 2011 07:55:01 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=b4ae4472b9de3d833b18e512aba94878a4b05884;p=packages%2Fb%2Fbup.git

Merge branch 'maint'

* maint:
  Makefile: Fix 'clean' rule

Conflicts:
	Makefile
---

b4ae4472b9de3d833b18e512aba94878a4b05884
diff --cc Makefile
index 1b2e8ed,61f6e8d..5a317a6
--- a/Makefile
+++ b/Makefile
@@@ -146,9 -145,6 +146,9 @@@ clean: Documentation/clea
  		.*~ *~ */*~ 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]
 +		out[12] out2[tc] tags[12] tags2[tc] \
 +		testfs.img lib/bup/t/testfs.img
- 	chmod u+rwx lib/bup/t/pybuptest.tmp
+ 	[ -d lib/bup/t/pybuptest.tmp ] && chmod u+rwx lib/bup/t/pybuptest.tmp || true
  	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