Make use of bpkg --all-pattern option in build scripts and installation documentation

9 files changed, 17 insertions, 25 deletions

diff --git a/BOOTSTRAP-UNIX.cli b/BOOTSTRAP-UNIX.cli
index 8f75cc2..21f502d 100644
--- a/BOOTSTRAP-UNIX.cli
+++ b/BOOTSTRAP-UNIX.cli
@@ -337,7 +337,7 @@ Finally, we build and install the standard build system modules:
 
 \
 $ bpkg build --for install libbuild2-kconfig
-$ bpkg install libbuild2-kconfig
+$ bpkg install --all-pattern=libbuild2-*
 \
 
 \N|To get a list of the standard pre-installed build system modules in a
diff --git a/BOOTSTRAP-WINDOWS-CLANG.cli b/BOOTSTRAP-WINDOWS-CLANG.cli
index 7f44b9d..694fa91 100644
--- a/BOOTSTRAP-WINDOWS-CLANG.cli
+++ b/BOOTSTRAP-WINDOWS-CLANG.cli
@@ -252,7 +252,7 @@ Finally, we build and install the standard build system modules:
 
 \
 > bpkg build --for install libbuild2-kconfig
-> bpkg install libbuild2-kconfig
+> bpkg install --all-pattern=libbuild2-*
 \
 
 \N|To get a list of the standard pre-installed build system modules in a
diff --git a/BOOTSTRAP-WINDOWS-MINGW.cli b/BOOTSTRAP-WINDOWS-MINGW.cli
index 834e4a3..4ed9049 100644
--- a/BOOTSTRAP-WINDOWS-MINGW.cli
+++ b/BOOTSTRAP-WINDOWS-MINGW.cli
@@ -255,7 +255,7 @@ Finally, we build and install the standard build system modules:
 
 \
 > bpkg build --for install libbuild2-kconfig
-> bpkg install libbuild2-kconfig
+> bpkg install --all-pattern=libbuild2-*
 \
 
 \N|To get a list of the standard pre-installed build system modules in a
diff --git a/BOOTSTRAP-WINDOWS-MSVC.cli b/BOOTSTRAP-WINDOWS-MSVC.cli
index 9e54c59..dbe5ede 100644
--- a/BOOTSTRAP-WINDOWS-MSVC.cli
+++ b/BOOTSTRAP-WINDOWS-MSVC.cli
@@ -226,7 +226,7 @@ Finally, we build and install the standard build system modules:
 
 \
 > bpkg build --for install libbuild2-kconfig
-> bpkg install libbuild2-kconfig
+> bpkg install --all-pattern=libbuild2-*
 \
 
 \N|To get a list of the standard pre-installed build system modules in a
diff --git a/README-GIT b/README-GIT
index 7a2cae1..63223bd 100644
--- a/README-GIT
+++ b/README-GIT
@@ -33,7 +33,7 @@ A few additional notes:
    Instead, their updates (normally to something tagged) must be requested
    explicitly:
 
-   git submodule update --remote --checkout sqlite
+   git submodule update --remote --checkout submodules/sqlite
 
    Note that you need a fairly recent git (e.g., 2.9) for this enforcement
    to work.
diff --git a/build-clang.bat.in b/build-clang.bat.in
index fe7e26d..bee0759 100644
--- a/build-clang.bat.in
+++ b/build-clang.bat.in
@@ -501,21 +501,19 @@ bdep --version
 @rem Build, install, and verify the build system modules.
 @rem
 @set "packages="
-@set "package_versions="
 @set "tests="
 
 @for %%m in (%modules%) do @(
-  set "packages=!packages! libbuild2-%%m"
-  set "package_versions=!package_versions! libbuild2-%%m/!%%m_ver!"
+  set "packages=!packages! libbuild2-%%m/!%%m_ver!"
   set "tests=!tests! tests\libbuild2-%%m-tests\"
 )
 
 @if "_%packages%_" == "__" goto mods_ipe
 
-bpkg build --for install %package_versions:~1%
+bpkg build --for install %packages:~1%
 @if errorlevel 1 goto error
 
-bpkg install %packages:~1%
+bpkg install --all-pattern=libbuild2-*
 @if errorlevel 1 goto error
 
 :mods_ipe
diff --git a/build-mingw.bat.in b/build-mingw.bat.in
index 86c35bf..3289bd3 100644
--- a/build-mingw.bat.in
+++ b/build-mingw.bat.in
@@ -511,21 +511,19 @@ bdep --version
 @rem Build, install, and verify the build system modules.
 @rem
 @set "packages="
-@set "package_versions="
 @set "tests="
 
 @for %%m in (%modules%) do @(
-  set "packages=!packages! libbuild2-%%m"
-  set "package_versions=!package_versions! libbuild2-%%m/!%%m_ver!"
+  set "packages=!packages! libbuild2-%%m/!%%m_ver!"
   set "tests=!tests! tests\libbuild2-%%m-tests\"
 )
 
 @if "_%packages%_" == "__" goto mods_ipe
 
-bpkg build --for install %package_versions:~1%
+bpkg build --for install %packages:~1%
 @if errorlevel 1 goto error
 
-bpkg install %packages:~1%
+bpkg install --all-pattern=libbuild2-*
 @if errorlevel 1 goto error
 
 :mods_ipe
diff --git a/build-msvc.bat.in b/build-msvc.bat.in
index 46c5ddb..bf00a6b 100644
--- a/build-msvc.bat.in
+++ b/build-msvc.bat.in
@@ -475,21 +475,19 @@ bdep --version
 @rem Build, install, and verify the build system modules.
 @rem
 @set "packages="
-@set "package_versions="
 @set "tests="
 
 @for %%m in (%modules%) do @(
-  set "packages=!packages! libbuild2-%%m"
-  set "package_versions=!package_versions! libbuild2-%%m/!%%m_ver!"
+  set "packages=!packages! libbuild2-%%m/!%%m_ver!"
   set "tests=!tests! tests\libbuild2-%%m-tests\"
 )
 
 @if "_%packages%_" == "__" goto mods_ipe
 
-bpkg build --for install %package_versions:~1%
+bpkg build --for install %packages:~1%
 @if errorlevel 1 goto error
 
-bpkg install %packages:~1%
+bpkg install --all-pattern=libbuild2-*
 @if errorlevel 1 goto error
 
 :mods_ipe
diff --git a/build.sh.in b/build.sh.in
index 613dad3..0c48831 100644
--- a/build.sh.in
+++ b/build.sh.in
@@ -555,18 +555,16 @@ fi
 # Build, install, and verify the build system modules.
 #
 packages=
-package_versions=
 tests=
 
 for m in $module_list; do
-  packages="$packages libbuild2-$m"
-  package_versions="$package_versions libbuild2-$m/$(module_version "$m")"
+  packages="$packages libbuild2-$m/$(module_version "$m")"
   tests="$tests tests/libbuild2-$m-tests/"
 done
 
 if test -n "$packages"; then
-  run bpkg build --for install $package_versions
-  run bpkg install $packages
+  run bpkg build --for install $packages
+  run bpkg install --all-pattern=libbuild2-*
 fi
 
 run cd "$owd"