From 4d8edc5269a6e72be6e4a1257b67646dfce932ae Mon Sep 17 00:00:00 2001
From: David Reiss <dreiss@apache.org>
Date: Mon, 30 Jun 2008 21:55:52 +0000
Subject: [PATCH] (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
---
 compiler/cpp/Makefile.am | 2 +-
 print_version.sh         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/compiler/cpp/Makefile.am b/compiler/cpp/Makefile.am
index 2dcdb5e1..7cf41a81 100644
--- 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 92d1a2df..cb742014 100755
--- 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
-- 
2.17.1