From 080fb39e0d41a2d293f2480a5de0673c605cfbdf Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Wed, 31 Aug 2016 19:24:57 +0300
Subject: Build infrastructure update

---
 odb/pgsql/buildfile | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

(limited to 'odb/pgsql/buildfile')

diff --git a/odb/pgsql/buildfile b/odb/pgsql/buildfile
index c2a13a5..50b3097 100644
--- a/odb/pgsql/buildfile
+++ b/odb/pgsql/buildfile
@@ -49,7 +49,15 @@ details/build2/{h              }{ config                        } \
 details/build2/{h              }{ config-vc                     } \
                                   $imp_libs $int_libs
 
-cxx.poptions =+ -I$out_root -I$src_root -DLIBODB_PGSQL_BUILD2
+# For pre-releases use the complete version to make sure they cannot be used
+# in place of another pre-release or the final version.
+#
+if $abi_prerelease
+  lib{odb-pgsql}: bin.lib.version = @-$version
+else
+  lib{odb-pgsql}: bin.lib.version = @-$abi_major.$abi_minor
+
+cxx.poptions =+ -DLIBODB_PGSQL_BUILD2
 obja{*}: cxx.poptions += -DLIBODB_PGSQL_STATIC_BUILD
 objs{*}: cxx.poptions += -DLIBODB_PGSQL_SHARED_BUILD
 
@@ -59,17 +67,6 @@ libs{odb-pgsql}: cxx.export.poptions += -DLIBODB_PGSQL_SHARED
 
 lib{odb-pgsql}: cxx.export.libs = $int_libs
 
-# Load the cli module but only if it's available. This way a distribution that
-# includes pre-generated files can be built without installing cli.
-#
-using? cli
-
-if! $cli.loaded
-{
-  define cli: file
-  cli{*}: extension = cli
-}
-
 details/:
 {
   {hxx ixx cxx}{options}: cli{options}
-- 
cgit v1.1