From 583079bea545963cbc964a53dbacb2174be97799 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Mon, 5 Sep 2016 19:03:41 +0200
Subject: Add major.minor version to created bpkg configuration directory

---
 build.sh | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to 'build.sh')

diff --git a/build.sh b/build.sh
index 820d89f..5c2f886 100755
--- a/build.sh
+++ b/build.sh
@@ -18,6 +18,11 @@ if test -z "$BUILD2_REPO"; then
 #  BUILD2_REPO="https://pkg.cppget.org/1/alpha"
 fi
 
+# Bpkg configuration directory.
+#
+cver="0.4"
+cdir="build2-toolchain-$cver"
+
 diag ()
 {
   echo "$*" 1>&2
@@ -134,8 +139,8 @@ if test -f build/config.build; then
   exit 1
 fi
 
-if test -d ../build2-toolchain; then
-  diag "../build2-toolchain/ bpkg configuration directory already exists"
+if test -d "../$cdir"; then
+  diag "../$cdir/ bpkg configuration directory already exists"
   exit 1
 fi
 
@@ -195,9 +200,8 @@ run bpkg-stage --version
 # Install.
 #
 run cd ..
-run mkdir build2-toolchain
-run cd build2-toolchain
-cdir="$(pwd)"
+run mkdir "$cdir"
+run cd "$cdir"
 
 run bpkg-stage create \
 cc \
-- 
cgit v1.1