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 aeba17a677504c77fd157a00321f6e41ccd3a970..1a1be6440a19fa4744a49ff604fb57f27f83e46e 100644 (file)
--- 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 60ec7029260237d6ddd36ccea90fbb4444eaad7d..7593e4210feece08b709c14215787741fe5e442f 100644 (file)
--- 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 4400baa0b86bfe1471fd347c259e58fbfbeb62d1..c5056f4d58b5319f390cec3284b7651893b31adf 100644 (file)
--- 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