From: Andrew Bartlett <abartlet@samba.org>
Date: Fri, 9 Feb 2024 09:32:16 +0000 (+1300)
Subject: lib/ldb: Adapt pkg-config files to being build from the main build.
X-Git-Tag: tdb-1.4.11~1604
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1edd8c066c2a09ebfd9dad94a2fc289d7ee3b6c4;p=thirdparty%2Fsamba.git

lib/ldb: Adapt pkg-config files to being build from the main build.

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
---

diff --git a/lib/ldb/ldb.pc.in b/lib/ldb/ldb.pc.in
index aeba17a6775..1a1be6440a1 100644
--- a/lib/ldb/ldb.pc.in
+++ b/lib/ldb/ldb.pc.in
@@ -6,7 +6,7 @@ modulesdir=@LDB_MODULESDIR@
 
 Name: ldb
 Description: An LDAP-like embedded database
-Version: @PACKAGE_VERSION@
+Version: @LDB_PACKAGE_VERSION@
 Requires.private: tdb
 Requires: talloc 
 Libs: @LIB_RPATH@ -L${libdir} -lldb
diff --git a/lib/ldb/pyldb-util.pc.in b/lib/ldb/pyldb-util.pc.in
index 60ec7029260..7593e4210fe 100644
--- a/lib/ldb/pyldb-util.pc.in
+++ b/lib/ldb/pyldb-util.pc.in
@@ -6,7 +6,7 @@ modulesdir=@LDB_MODULESDIR@
 
 Name: pyldb-util@PYTHON_SO_ABI_FLAG@
 Description: Python bindings for LDB
-Version: @PACKAGE_VERSION@
+Version: @LDB_PACKAGE_VERSION@
 Requires: ldb
 Libs: @LIB_RPATH@ -L${libdir} -lpyldb-util@PYTHON_LIBNAME_SO_ABI_FLAG@
 Cflags: -I${includedir}
diff --git a/lib/ldb/wscript b/lib/ldb/wscript
index 4400baa0b86..c5056f4d58b 100644
--- a/lib/ldb/wscript
+++ b/lib/ldb/wscript
@@ -165,10 +165,8 @@ def build(bld):
     bld.RECURSE('lib/replace')
     bld.RECURSE('lib/tdb')
 
-    if bld.env.standalone_ldb:
-        if not 'PACKAGE_VERSION' in bld.env:
-            bld.env.PACKAGE_VERSION = VERSION
-        bld.env.PKGCONFIGDIR = '${LIBDIR}/pkgconfig'
+    if not 'LDB_PACKAGE_VERSION' in bld.env:
+        bld.env.LDB_PACKAGE_VERSION = VERSION
 
     private_library = not bld.env.ldb_is_public_library