[2/3] documentation commit: updated refs/heads/master to 3096413

[kx...@apache.org]

Don't guess version from git

This doesn't works when you need to provide documentation for
non-released versions. It'll try to use last-know-tag for that and
cause people confusion.


Project: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/commit/ab4fc456
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/tree/ab4fc456
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/diff/ab4fc456

Branch: refs/heads/master
Commit: ab4fc456631fe6d63555c8b491df31b1284a842c
Parents: 206d631
Author: Alexander Shorin <kx...@apache.org>
Authored: Wed Mar 11 16:48:23 2015 +0300
Committer: Alexander Shorin <kx...@apache.org>
Committed: Wed Mar 11 16:48:23 2015 +0300

----------------------------------------------------------------------
 Makefile | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/ab4fc456/Makefile
----------------------------------------------------------------------
diff --git a/Makefile b/Makefile
index 85b9b10..e0c00e8 100644
--- a/Makefile
+++ b/Makefile
@@ -12,13 +12,10 @@
 
 SPHINXBUILD  := sphinx-build
 BUILDDIR     := build
-COUCHVERSION := $(shell git describe --tags --abbrev=0 2>/dev/null || echo unknown)
-COUCHDOCSHA  := $(shell git rev-parse --verify --short HEAD 2>/dev/null || echo src)
-COUCHRELEASE := $(COUCHVERSION)-git-$(COUCHDOCSHA)
 SOURCE       := src/
 PAPERSIZE    := -D latex_paper_size=a4
 SPHINXFLAGS  := -a -E -W -n -A local=1 $(PAPERSIZE) -d $(BUILDDIR)/doctree
-SPHINXOPTS   := $(SPHINXFLAGS) -D version=$(COUCHVERSION) -D release=$(COUCHRELEASE) $(SOURCE)
+SPHINXOPTS   := $(SPHINXFLAGS) $(SOURCE)
 
 all: distclean html pdf info man install clean