Make a start on the Magic Folder Objective 5 (user interface design) doc. refs ticket...

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

diff --git a/Makefile b/Makefile
index 00f025ae4480b1da257c35bea5c768df52a276f1..97587cd4e60c98fb2bedfd79c486d395059276e7 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -35,14 +35,14 @@ build:
 # Build OS X pkg packages.
 .PHONY: build-osx-pkg test-osx-pkg upload-osx-pkg
 build-osx-pkg: build
-       misc/build_helpers/build-osx-pkg.sh $(APPNAME) $(shell sh -c "cat src/allmydata/_version.py | grep verstr | head -n 1 | cut -d' ' -f 3")
+       misc/build_helpers/build-osx-pkg.sh $(APPNAME)
 
 test-osx-pkg:
        $(PYTHON) misc/build_helpers/test-osx-pkg.py
 
 upload-osx-pkg:
        @if [ "X${BB_BRANCH}" = "Xmaster" ] || [ "X${BB_BRANCH}" = "X" ]; then \
-         flappclient --furlfile ~/.tahoe-osx-pkg-upload.furl upload-file tahoe-lafs-osx.pkg; \
+         flappclient --furlfile ~/.tahoe-osx-pkg-upload.furl upload-file tahoe-lafs-*-osx.pkg; \
         else \
          echo not uploading tahoe-lafs-osx-pkg because this is not trunk but is branch \"${BB_BRANCH}\" ; \
        fi