Simplify stage command line by using relative data_dir in build scripts

3 files changed, 6 insertions, 9 deletions

diff --git a/build-mingw.bat b/build-mingw.bat
index 3a6df43..0c74cd7 100644
--- a/build-mingw.bat
+++ b/build-mingw.bat
@@ -68,7 +68,6 @@ if exist ..\build2-toolchain\ (
   goto error
 )
 
-set "sdir=%idir%\stage"
 set "PATH=%idir%\bin;%PATH%"
 
 rem Show the steps we are performing.
@@ -109,8 +108,8 @@ build2\build2\b-boot configure^
  config.cxx=%cxx%^
  config.bin.lib=shared^
  config.bin.suffix=-stage^
- config.install.root=%sdir%^
- config.install.exec_root=%idir%
+ config.install.root=%idir%^
+ config.install.data_root=root\stage
 @if errorlevel 1 goto error
 
 build2\build2\b-boot install
diff --git a/build-msvc.bat b/build-msvc.bat
index b56be54..3f8758d 100644
--- a/build-msvc.bat
+++ b/build-msvc.bat
@@ -100,8 +100,8 @@ build2\build2\b-boot configure^
  config.cxx=cl^
  config.bin.lib=shared^
  config.bin.suffix=-stage^
- config.install.root=%sdir%^
- config.install.exec_root=%idir%
+ config.install.root=%idir%^
+ config.install.data_root=root\stage
 @if errorlevel 1 goto error
 
 build2\build2\b-boot install
diff --git a/build.sh b/build.sh
index 080f9cd..c8cf2cc 100755
--- a/build.sh
+++ b/build.sh
@@ -118,8 +118,6 @@ fi
 PATH="$idir/bin:$PATH"
 export PATH
 
-sdir="$idir/stage"
-
 # Bootstrap, stage 1.
 #
 run cd build2
@@ -141,8 +139,8 @@ config.cxx="$cxx" \
 config.bin.lib=shared \
 config.bin.suffix=-stage \
 config.bin.rpath="$idir/lib" \
-config.install.data_root="$sdir" \
-config.install.exec_root="$idir" \
+config.install.root="$idir" \
+config.install.data_root=root/stage \
 config.install.sudo="$sudo"
 
 run build2/build2/b-boot install