From f416ac6099079fa1e00c61c6100970e1110f1b96 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Mon, 1 May 2017 19:11:13 +0200
Subject: Fix wrong path in build scripts diagnostics

---
 build-mingw.bat | 6 +++++-
 build-msvc.bat  | 6 +++++-
 build.sh        | 3 ++-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/build-mingw.bat b/build-mingw.bat
index b41073b..e7a8cb5 100644
--- a/build-mingw.bat
+++ b/build-mingw.bat
@@ -163,6 +163,10 @@ md %cdir%
 
 cd %cdir%
 
+@rem Save full path for later.
+@rem
+@set "cdir=%CD%"
+
 bpkg-stage create^
  cc^
  config.cxx=%cxx%^
@@ -204,7 +208,7 @@ b uninstall
 
 echo.
 echo Toolchain installation: %idir%\bin
-echo Upgrade configuration:  %owd%\%cdir%
+echo Upgrade configuration:  %cdir%
 echo.
 
 goto end
diff --git a/build-msvc.bat b/build-msvc.bat
index 2e05958..eaa8092 100644
--- a/build-msvc.bat
+++ b/build-msvc.bat
@@ -153,6 +153,10 @@ md %cdir%
 
 cd %cdir%
 
+@rem Save full path for later.
+@rem
+@set "cdir=%CD%"
+
 bpkg-stage create^
  cc^
  config.cxx=cl^
@@ -194,7 +198,7 @@ b uninstall
 
 echo.
 echo Toolchain installation: %idir%\bin
-echo Upgrade configuration:  %owd%\%cdir%
+echo Upgrade configuration:  %cdir%
 echo.
 
 goto end
diff --git a/build.sh b/build.sh
index d25072f..053bc5a 100755
--- a/build.sh
+++ b/build.sh
@@ -203,6 +203,7 @@ run bpkg-stage --version
 run cd ..
 run mkdir "$cdir"
 run cd "$cdir"
+cdir="$(pwd)" # Save full path for later.
 
 run bpkg-stage create \
 cc \
@@ -238,5 +239,5 @@ run b uninstall
 
 diag
 diag "Toolchain installation: $idir/bin"
-diag "Upgrade configuration:  $owd/$cdir"
+diag "Upgrade configuration:  $cdir"
 diag
-- 
cgit v1.1