Use variables for source dir of python ldb bindings.

(This used to be commit cd4eddd31354f4ae45e8747da1a70340000716c3)

diff --git a/source4/Makefile b/source4/Makefile
index 6118b553f9b20887c26399863b83ebbc4a9f172b..1e5066b0020a01a6f6a2cda8f659d82c05fe9eb3 100644 (file)
--- a/source4/Makefile
+++ b/source4/Makefile
@@ -62,6 +62,7 @@ libsocketsrcdir := lib/socket
 libcharsetsrcdir := lib/charset
 ldb_sambasrcdir := lib/ldb-samba
 tdbsrcdir := lib/tdb
+ldbsrcdir := lib/ldb
 libtlssrcdir := lib/tls
 libregistrysrcdir := lib/registry
 smbreadlinesrcdir := lib/smbreadline

diff --git a/source4/lib/ldb/python.mk b/source4/lib/ldb/python.mk
index 5325446e1ee19ab49cc44225f5ff3669a7c86c98..8d48f5d810115caf3b188ca3f8a5aaae4ab7a148 100644 (file)
--- a/source4/lib/ldb/python.mk
+++ b/source4/lib/ldb/python.mk
@@ -2,9 +2,9 @@
 LIBRARY_REALNAME = _ldb.$(SHLIBEXT)
 PUBLIC_DEPENDENCIES = LIBLDB
 
-swig_ldb_OBJ_FILES = $(ldbdir)/ldb_wrap.o
-$(swig_ldb_OBJ_FILES): CFLAGS+=-I$(ldbdir)/include
+swig_ldb_OBJ_FILES = $(ldbsrcdir)/ldb_wrap.o
+$(swig_ldb_OBJ_FILES): CFLAGS+=-I$(ldbsrcdir)/include
 
-$(eval $(call python_py_module_template,ldb.py,$(ldbdir)/ldb.py))
+$(eval $(call python_py_module_template,ldb.py,$(ldbsrcdir)/ldb.py))
 
 $(swig_ldb_OBJ_FILES): CFLAGS+=$(CFLAG_NO_UNUSED_MACROS) $(CFLAG_NO_CAST_QUAL)