Modified the name of the documentation artifact to vary in release an…

…d snapshot build

Makefile

@@ -180,13 +180,13 @@ docpreview: javadoc godoc
 docpreview_clean:
 	CLEAN_TARGETS= $(MAKE) -C documentation docpreview_clean
 
-packages/foundationdb-docs-$(VERSION)-SNAPSHOT.tar.gz: FORCE javadoc godoc
+packages/foundationdb-docs-$(VERSION)-$(PKGRELEASE).tar.gz: FORCE javadoc godoc
 	TARGETS= $(MAKE) -C documentation docpackage
 	@mkdir -p packages
-	@rm -f packages/foundationdb-docs-SNAPSHOT.tar.gz
-	@cp documentation/sphinx/.dist/foundationdb-docs-$(VERSION)-SNAPSHOT.tar.gz packages/foundationdb-docs-$(VERSION)-SNAPSHOT.tar.gz
+	@rm -f packages/foundationdb-docs-$(VERSION)-$(PKGRELEASE).tar.gz
+	@cp documentation/sphinx/.dist/foundationdb-docs-$(VERSION)-$(PKGRELEASE).tar.gz packages/foundationdb-docs-$(VERSION)-$(PKGRELEASE).tar.gz
 
-docpackage: packages/foundationdb-docs-$(VERSION)-SNAPSHOT.tar.gz
+docpackage: packages/foundationdb-docs-$(VERSION)-$(PKGRELEASE).tar.gz
 
 FORCE:
 

documentation/sphinx/Makefile

@@ -4,18 +4,11 @@
 PROJECT_NAME	:= foundationdb-docs
 #VERSION		:= $(shell cat version)
 
-ifeq ($(RELEASE_BUILD),true)
-RELEASE		:= $(VERSION)
-else
-RELEASE		:= $(VERSION)-SNAPSHOT
-endif
-
 GIT_HEAD_REF	:= $(shell git rev-parse --short HEAD)
 GIT_BRANCH	:= $(shell git symbolic-ref --short HEAD)
 GIT_REPO_URL	:= $(shell git config --get remote.origin.url)
 
 # You can set these variables from the command line.
-#VERSIONOPTS	:= -D version=$(VERSION) -D release=$(RELEASE)
 SPHINXOPTS	:=  -c .
 PAPER		=
 ROOTDIR		:= $(CURDIR)
@@ -110,4 +103,5 @@ livehtml: html
 # removed html prerequisite because it is previously explictly invoked
 package:
 	mkdir -p $(DISTDIR)
-	cd $(BUILDDIR)/html && tar czf $(DISTDIR)/$(PROJECT_NAME)-$(RELEASE).tar.gz .
+	rm -f $(DISTDIR)/$(PROJECT_NAME)-$(VERSION)-$(PKGRELEASE).tar.gz
+	cd $(BUILDDIR)/html && tar czf $(DISTDIR)/$(PROJECT_NAME)-$(VERSION)-$(PKGRELEASE).tar.gz .