(THRIFT-40) Fix compilation and version string on OS X.

git-svn-id: https://svn.apache.org/repos/asf/incubator/thrift/trunk@672943 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/compiler/cpp/Makefile.am b/compiler/cpp/Makefile.am
index 2dcdb5e..7cf41a8 100644 (file)
--- a/compiler/cpp/Makefile.am
+++ b/compiler/cpp/Makefile.am
@@ -96,7 +96,7 @@ THRIFT_VERSION=$(shell /bin/sh $(top_srcdir)/print_version.sh -v)
 THRIFT_REVISION=$(shell /bin/sh $(top_srcdir)/print_version.sh -r)
 
 regen_version_h:
-       @echo -n "Regenerating version.h... "
+       @printf "Regenerating version.h... "
        @TMPFILE=`mktemp ./version_h.tmp_XXXXXX` ; \
                echo "// AUTOGENERATED, DO NOT EDIT" > $$TMPFILE ; \
                echo '#define THRIFT_VERSION "$(THRIFT_VERSION)"\n' >> $$TMPFILE ; \

diff --git a/print_version.sh b/print_version.sh
index 92d1a2d..cb74201 100755 (executable)
--- a/print_version.sh
+++ b/print_version.sh
@@ -12,7 +12,7 @@ if test -d .svn ; then
 elif test -d .git ; then
   SHA1=`git rev-list --max-count=1 --grep='^git-svn-id:' HEAD`
   REVISION=`git cat-file commit $SHA1 | sed -ne 's/^git-svn-id:[^@]*@\([0-9][0-9]*\).*/r\1/p'`
-  OFFSET=`git rev-list ^$SHA1 HEAD | wc -l`
+  OFFSET=`git rev-list ^$SHA1 HEAD | wc -l | tr -d ' '`
   if test $OFFSET != 0 ; then
     REVISION="$REVISION-$OFFSET-`git rev-parse --verify HEAD | cut -c 1-7`"
   fi