From 4e6a7bb069367e680e71ea5838f51670dbc006ae Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Tue, 17 Oct 2017 09:38:09 +0200
Subject: Adjust for version-specific baseutils controls

---
 stage | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/stage b/stage
index 7be3d7d..71da929 100755
--- a/stage
+++ b/stage
@@ -67,20 +67,20 @@ if [ -n "$base" ]; then
   echo "$v" >version
 
   ./pkdist -n baseutils -d "$vf" -p "$vf/list-i686" \
--c control -s ./pkpost \
+-c "$vf/control" -s ./pkpost \
 -z "/tmp/build2-baseutils-$v-i686-windows"
 
   ./pkdist -n baseutils -d "$vf" -p "$vf/list-x86_64" \
--c control -s ./pkpost \
+-c "$vf/control" -s ./pkpost \
 -z "/tmp/build2-baseutils-$v-x86_64-windows"
 
   ./pkdist -n mingw -d "mingw-$vf" -p "mingw-$vf/list-i686" \
--c ./control-mingw-i686 -s ./pkpost-mingw -u http://repo.msys2.org/mingw \
--x "/tmp/build2-mingw-$v-i686-windows"
+-c "mingw-$vf/control-i686" -s ./pkpost-mingw \
+-u http://repo.msys2.org/mingw -x "/tmp/build2-mingw-$v-i686-windows"
 
   ./pkdist -n mingw -d "mingw-$vf" -p "mingw-$vf/list-x86_64" \
--c ./control-mingw-x86_64 -s ./pkpost-mingw -u http://repo.msys2.org/mingw \
--x "/tmp/build2-mingw-$v-x86_64-windows"
+-c "mingw-$vf/control-x86_64" -s ./pkpost-mingw \
+-u http://repo.msys2.org/mingw -x "/tmp/build2-mingw-$v-x86_64-windows"
 
   cd ../..
 
-- 
cgit v1.1