Merge branch '2329-2': fix "tahoe cp -r" exception

[tahoe-lafs/tahoe-lafs.git] / Makefile

diff --git a/Makefile b/Makefile
index 4ad77d615a34f4671b200a1bcd0bb8590140610e..8a8b5ee3f4d424a8951b3a2f72d62483d295b72c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -11,6 +11,7 @@ export PYTHON
 
 TAHOE=$(PYTHON) bin/tahoe
 SOURCES=src/allmydata src/buildtest static misc bin/tahoe-script.template setup.py
+APPNAME=allmydata-tahoe
 
 # This is necessary only if you want to automatically produce a new
 # _version.py file from the current git history (without doing a build).
@@ -34,11 +35,9 @@ build:
 # Build OS X pkg packages.
 # The editing of .egg-link and .pth files ensures that we reference the source at the correct path.
 .PHONY: build-osx-pkg
-build-osx-pkg:
-       $(PYTHON) setup.py build
-       find support -name allmydata-tahoe.egg-link -execdir sh -c "echo >> {}; echo /Applications/tahoe.app/src >> {}" \;
+build-osx-pkg: build
+       find support -name $(APPNAME).egg-link -execdir sh -c "echo >> {}; echo /Applications/tahoe.app/src >> {}" \;
        find support -name easy-install.pth -execdir sed -i.bak 's|^.*/src$$|../../../../src|' '{}' \;
-       touch .built
 
 # create component pkg
        pkgbuild --root $(shell pwd) \
@@ -310,4 +309,4 @@ tarballs:
 
 .PHONY: upload-tarballs
 upload-tarballs:
-       @if [ "X${BB_BRANCH}" = "Xmaster" ] || [ "X${BB_BRANCH}" = "X" ]; then for f in dist/allmydata-tahoe-*; do flappclient --furlfile ~/.tahoe-tarball-upload.furl upload-file $$f; done ; else echo not uploading tarballs because this is not trunk but is branch \"${BB_BRANCH}\" ; fi
+       @if [ "X${BB_BRANCH}" = "Xmaster" ] || [ "X${BB_BRANCH}" = "X" ]; then for f in dist/$(APPNAME)-*; do flappclient --furlfile ~/.tahoe-tarball-upload.furl upload-file $$f; done ; else echo not uploading tarballs because this is not trunk but is branch \"${BB_BRANCH}\" ; fi