summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoah Slater <nslater@apache.org>2013-03-09 23:04:09 +0000
committerNoah Slater <nslater@apache.org>2013-03-09 23:04:09 +0000
commit06c3f351f158f107a8293c7c6c9b2415b942f0e9 (patch)
tree3fdae3152e6ac302e0aa83920ef6551c4deaaf38
parent29526855e65e9d7307bb1ea9fb200cbc81c0f40f (diff)
downloadcouchdb-06c3f351f158f107a8293c7c6c9b2415b942f0e9.tar.gz
Cherry-pick a cherry-pick of c0e77168
-rwxr-xr-xbootstrap8
1 files changed, 4 insertions, 4 deletions
diff --git a/bootstrap b/bootstrap
index 021275bad..f388ddaec 100755
--- a/bootstrap
+++ b/bootstrap
@@ -33,14 +33,14 @@ get () {
if test -z "$REVISION"; then
if test -e .git; then
- REVISION=`git describe --always`-git
+ REVISION=`git describe --always`
fi
fi
if test -z "`get LOCAL_VERSION_STAGE`" -o -z "$REVISION"; then
- sed "s/%release%//" < acinclude.m4.in > acinclude.m4
+ sed "s/%revision%//" < acinclude.m4.in > acinclude.m4
else
- sed "s/%release%/$REVISION/" < acinclude.m4.in > acinclude.m4
+ sed "s/%revision%/$REVISION/" < acinclude.m4.in > acinclude.m4
fi
if test -e .git; then
@@ -148,4 +148,4 @@ cat << EOF
You have bootstrapped Apache CouchDB, time to relax.
Run \`./configure' to configure the source before you install.
-EOF \ No newline at end of file
+EOF