From ecb987c97c98d7374a0e703c56f2a71f8514ece8 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 11 Feb 2008 23:51:59 +0100
Subject: Fix out of tree builds. (This used to be commit
 35c8ebdca2612b52cd3eb2aafd35041d17173722)

---
 source4/lib/ldb/Makefile.in    | 5 +++--
 source4/lib/ldb/ldb.mk         | 6 +++---
 source4/lib/talloc/Makefile.in | 4 ++--
 source4/lib/tdb/Makefile.in    | 4 ++--
 source4/lib/tdb/tdb.mk         | 2 +-
 5 files changed, 11 insertions(+), 10 deletions(-)

(limited to 'source4/lib')

diff --git a/source4/lib/ldb/Makefile.in b/source4/lib/ldb/Makefile.in
index a8555d992f..738ffe1adb 100644
--- a/source4/lib/ldb/Makefile.in
+++ b/source4/lib/ldb/Makefile.in
@@ -20,6 +20,7 @@ EXTRA_OBJ=@EXTRA_OBJ@
 TESTS=test-tdb.sh @TESTS@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 tdbdir = @tdbdir@
+ldbdir = $(srcdir)
 tallocdir = @tallocdir@
 
 TALLOC_LIBS = @TALLOC_LIBS@
@@ -67,7 +68,7 @@ DIRS = lib bin common ldb_tdb ldb_ldap ldb_sqlite3 modules tools examples
 
 default: all
 
-include rules.mk
+include $(ldbdir)/rules.mk
 
 nss: nssdir all $(NSS_LIB)
 
@@ -160,4 +161,4 @@ gcov::
 	$(GCOV) -po modules $(srcdir)/modules/*.c 2| tee modules.report.gcov
 	$(GCOV) -po tools $(srcdir)/tools/*.c 2| tee tools.report.gcov
 
-include ldb.mk
+include $(ldbdir)/ldb.mk
diff --git a/source4/lib/ldb/ldb.mk b/source4/lib/ldb/ldb.mk
index 20913314b4..b9aa24b276 100644
--- a/source4/lib/ldb/ldb.mk
+++ b/source4/lib/ldb/ldb.mk
@@ -66,10 +66,10 @@ examples/ldifreader: examples/ldifreader.o $(LIBS)
 
 # Python bindings
 build-python:: lib/libldb.$(SHLIBEXT) ldb_wrap.c
-	./setup.py build
+	$(ldbdir)/setup.py build
 
 install-python:: build-python
-	./setup.py install --prefix=$(DESTDIR)$(prefix)
+	$(ldbdir)/setup.py install --prefix=$(DESTDIR)$(prefix)
 
 install-swig::
 	cp ldb.i `$(SWIG) -swiglib`
@@ -79,4 +79,4 @@ check-python:: build-python
 	LD_LIBRARY_PATH=lib PYTHONPATH=.:build/lib.linux-i686-2.4/ trial tests/python/api.py
 
 clean-python::
-	./setup.py clean
+	$(ldbdir)/setup.py clean
diff --git a/source4/lib/talloc/Makefile.in b/source4/lib/talloc/Makefile.in
index 855c708f71..f5d1cd109c 100644
--- a/source4/lib/talloc/Makefile.in
+++ b/source4/lib/talloc/Makefile.in
@@ -25,8 +25,8 @@ LIBOBJ = $(TALLOC_OBJ) @LIBREPLACEOBJ@
 
 all:: showflags $(EXTRA_TARGETS)
 
-include rules.mk
-include talloc.mk
+include $(tallocdir)/rules.mk
+include $(tallocdir)/talloc.mk
 
 $(SOLIB): $(LIBOBJ)
 	$(SHLD) $(SHLD_FLAGS) -o $@ $(LIBOBJ) @SONAMEFLAG@$(SONAME)
diff --git a/source4/lib/tdb/Makefile.in b/source4/lib/tdb/Makefile.in
index 56b10cce69..9730dffe60 100644
--- a/source4/lib/tdb/Makefile.in
+++ b/source4/lib/tdb/Makefile.in
@@ -30,8 +30,8 @@ TDB_OBJ = @TDB_OBJ@ @LIBREPLACEOBJ@
 
 all:: showflags dirs $(PROGS) $(SOLIB) libtdb.a $(PYTHON_BUILD_TARGET)
 
-include tdb.mk
-include rules.mk
+include $(tdbdir)/tdb.mk
+include $(tdbdir)/rules.mk
 
 install:: all
 $(SOLIB): $(TDB_OBJ)
diff --git a/source4/lib/tdb/tdb.mk b/source4/lib/tdb/tdb.mk
index 3b5166b16c..d6118dd38f 100644
--- a/source4/lib/tdb/tdb.mk
+++ b/source4/lib/tdb/tdb.mk
@@ -34,7 +34,7 @@ clean::
 	rm -f $(ALL_PROGS) tdb.pc
 
 build-python:: libtdb.$(SHLIBEXT) tdb_wrap.c
-	./setup.py build
+	$(tdbdir)/setup.py build
 
 install:: installdirs installbin installheaders installlibs \
 		  $(PYTHON_INSTALL_TARGET)
-- 
cgit