diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-02-11 23:51:59 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-02-11 23:51:59 +0100 |
| commit | ecb987c97c98d7374a0e703c56f2a71f8514ece8 (patch) | |
| tree | 39f64d43110d029641cc65a17f808019ddf7bd49 /source4/lib/ldb | |
| parent | 3e3946cdca362b8abdff53245c004f37a5011474 (diff) | |
| download | samba-ecb987c97c98d7374a0e703c56f2a71f8514ece8.tar.gz samba-ecb987c97c98d7374a0e703c56f2a71f8514ece8.tar.bz2 samba-ecb987c97c98d7374a0e703c56f2a71f8514ece8.zip | |
Fix out of tree builds.
(This used to be commit 35c8ebdca2612b52cd3eb2aafd35041d17173722)
Diffstat (limited to 'source4/lib/ldb')
| -rw-r--r-- | source4/lib/ldb/Makefile.in | 5 | ||||
| -rw-r--r-- | source4/lib/ldb/ldb.mk | 6 |
2 files changed, 6 insertions, 5 deletions
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 |