From 2c10a3a40ab8333c066351c8fbf545425d555367 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Tue, 7 May 2024 15:04:22 +0200 Subject: Update odb.sh to match switch to libbutl-odb --- bdep/odb.sh | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/bdep/odb.sh b/bdep/odb.sh index 0f71977..35be812 100755 --- a/bdep/odb.sh +++ b/bdep/odb.sh @@ -16,8 +16,9 @@ if test -d ../.bdep; then sed -r -ne 's#^(@[^ ]+ )?([^ ]+)/ .*default.*$#\2#p')" fi - inc+=("-I$(echo "$cfg"/libodb-[1-9]*/)") - inc+=("-I$(echo "$cfg"/libodb-sqlite-[1-9]*/)") + # Note: there is nothing generated in libbutl-odb. + # + inc+=("-I../../libbutl/libbutl-odb") inc+=("-I$cfg/libbutl") inc+=("-I../../libbutl") @@ -30,11 +31,7 @@ sed -r -ne 's#^(@[^ ]+ )?([^ ]+)/ .*default.*$#\2#p')" else - inc+=("-I$HOME/work/odb/builds/default/libodb-sqlite-default") - inc+=("-I$HOME/work/odb/libodb-sqlite") - - inc+=("-I$HOME/work/odb/builds/default/libodb-default") - inc+=("-I$HOME/work/odb/libodb") + inc+=("-I../../libbutl/libbutl-odb") inc+=(-I.. -I../../libbpkg -I../../libbutl) -- cgit v1.1