From f9910e9a26fe2c5c12f32187fdb3525ceb9cd873 Mon Sep 17 00:00:00 2001
From: Alan Conway <aconway@apache.org>
Date: Wed, 17 Mar 2010 16:33:50 +0000
Subject: C++ automake build picks up version number from
 qpid/QPID_VERSION.txt.

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@924359 13f79535-47bb-0310-9956-ffa450edef68
---
 qpid/cpp/bootstrap | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'qpid/cpp/bootstrap')

diff --git a/qpid/cpp/bootstrap b/qpid/cpp/bootstrap
index 5f33fec63f..925344acf7 100755
--- a/qpid/cpp/bootstrap
+++ b/qpid/cpp/bootstrap
@@ -1,5 +1,8 @@
 #!/bin/sh
-set -e
+
+# Copy the global QPID_VERSION.txt file into the source tree.
+cp ../QPID_VERSION.txt .
+
 aclocal -I m4
 autoheader
 libtoolize --automake
@@ -15,10 +18,10 @@ cat > src/managementgen.mk <<EOF
 	\$(mgen_cmd)
 EOF
 
-
 automake
 autoconf
 
+# Optionally do the build as well.
 if [ "$1" = "-build" -o "$1" = "--build" ] ; then
     shift
     ./configure "$@"
-- 
cgit v1.2.1