Makefile: BB_BRANCH is set to the empty string for trunk, not the string 'trunk'.

diff --git a/Makefile b/Makefile
index a5c11adcf2c7ad1ab0f154745d21c8d817e5957c..67e46b25bda86b405d2344902597455e53d04643 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -289,7 +289,7 @@ tarballs:
        $(PYTHON) setup.py sdist --sumo --formats=bztar,gztar,zip
 
 upload-tarballs:
-       @if [ "X${BB_BRANCH}" == "Xtrunk" ]; 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}" == "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
 
 # DEBIAN PACKAGING