Updated Branches: refs/heads/1.3.x 29526855e -> 06c3f351f
Cherry-pick a cherry-pick of c0e77168 Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/06c3f351 Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/06c3f351 Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/06c3f351 Branch: refs/heads/1.3.x Commit: 06c3f351f158f107a8293c7c6c9b2415b942f0e9 Parents: 2952685 Author: Noah Slater <nsla...@apache.org> Authored: Sat Mar 9 23:04:09 2013 +0000 Committer: Noah Slater <nsla...@apache.org> Committed: Sat Mar 9 23:04:09 2013 +0000 ---------------------------------------------------------------------- bootstrap | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb/blob/06c3f351/bootstrap ---------------------------------------------------------------------- diff --git a/bootstrap b/bootstrap index 021275b..f388dda 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
