From 252559253c42380baab67c3528359ee635c8a6d5 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Wed, 26 Jan 2022 13:06:32 +0200
Subject: Adjust to match new bash module semantics

---
 libbutl/buildfile                   | 2 +-
 libbutl/manifest-parser.bash.in     | 2 +-
 libbutl/manifest-serializer.bash.in | 2 +-
 libbutl/standard-version.bash.in    | 2 +-
 tests/manifest-parser/driver.in     | 2 +-
 tests/manifest-serializer/driver.in | 2 +-
 tests/standard-version/driver.in    | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/libbutl/buildfile b/libbutl/buildfile
index f03bdf1..b0cd830 100644
--- a/libbutl/buildfile
+++ b/libbutl/buildfile
@@ -21,4 +21,4 @@ exe{standard-version}: cxx{standard-version} $libs
 
 # Install our binding support executables next to the modules.
 #
-exe{*}: install = bin/libbutl/
+exe{*}: install = bin/libbutl.bash/
diff --git a/libbutl/manifest-parser.bash.in b/libbutl/manifest-parser.bash.in
index df06138..2edd517 100644
--- a/libbutl/manifest-parser.bash.in
+++ b/libbutl/manifest-parser.bash.in
@@ -7,7 +7,7 @@ else
   butl_manifest_parser=true
 fi
 
-@import libbutl/utility@
+@import libbutl.bash/utility@
 
 # Parse the manifest reading from stdin and writing the binary representation
 # to stdout.
diff --git a/libbutl/manifest-serializer.bash.in b/libbutl/manifest-serializer.bash.in
index ce99779..85ecf30 100644
--- a/libbutl/manifest-serializer.bash.in
+++ b/libbutl/manifest-serializer.bash.in
@@ -7,7 +7,7 @@ else
   butl_manifest_serializer=true
 fi
 
-@import libbutl/utility@
+@import libbutl.bash/utility@
 
 # Serialize the manifest reading the binary representation from stdin and
 # writing to stdout. Unless --long-lines is specified, break lines in values.
diff --git a/libbutl/standard-version.bash.in b/libbutl/standard-version.bash.in
index 20215d9..da5c6d7 100644
--- a/libbutl/standard-version.bash.in
+++ b/libbutl/standard-version.bash.in
@@ -7,7 +7,7 @@ else
   butl_standard_version=true
 fi
 
-@import libbutl/utility@
+@import libbutl.bash/utility@
 
 # Check that the specified predicates are true for a standard version.
 #
diff --git a/tests/manifest-parser/driver.in b/tests/manifest-parser/driver.in
index bf95410..bdc16bb 100644
--- a/tests/manifest-parser/driver.in
+++ b/tests/manifest-parser/driver.in
@@ -6,7 +6,7 @@
 trap "{ exit 1; }" ERR
 set -o errtrace # Trap ERR in functions.
 
-@import libbutl/manifest-parser@
+@import libbutl.bash/manifest-parser@
 
 butl_manifest_parser_start "$@"
 
diff --git a/tests/manifest-serializer/driver.in b/tests/manifest-serializer/driver.in
index 65b3595..8e02049 100644
--- a/tests/manifest-serializer/driver.in
+++ b/tests/manifest-serializer/driver.in
@@ -6,7 +6,7 @@
 trap "{ exit 1; }" ERR
 set -o errtrace # Trap ERR in functions.
 
-@import libbutl/manifest-serializer@
+@import libbutl.bash/manifest-serializer@
 
 butl_manifest_serializer_start "$@"
 
diff --git a/tests/standard-version/driver.in b/tests/standard-version/driver.in
index f1df612..5f4544b 100644
--- a/tests/standard-version/driver.in
+++ b/tests/standard-version/driver.in
@@ -3,6 +3,6 @@
 # file      : tests/standard-version/driver.in
 # license   : MIT; see accompanying LICENSE file
 
-@import libbutl/standard-version@
+@import libbutl.bash/standard-version@
 
 butl_standard_version "$@"
-- 
cgit v1.1