summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-02-12 12:41:21 +0100
committerJelmer Vernooij <jelmer@samba.org>2008-02-12 12:42:31 +0100
commit923d1ec2f451c336da4ca507af49a3e9a01f9449 (patch)
tree967bb29bef047d4d38b3dfd2c32ef2be5c9af7f3
parentcd2b003abaaaed5054db6e266dbfccf7e1193932 (diff)
downloadsamba-923d1ec2f451c336da4ca507af49a3e9a01f9449.tar.gz
samba-923d1ec2f451c336da4ca507af49a3e9a01f9449.tar.bz2
samba-923d1ec2f451c336da4ca507af49a3e9a01f9449.zip
Fix installation of python module for ldb and tdb.
(This used to be commit 6c9a8bf9f03cef0fc1c5f7ec3f8786eccf79c851)
-rw-r--r--source4/lib/ldb/Makefile.in1
-rw-r--r--source4/lib/tdb/Makefile.in4
2 files changed, 4 insertions, 1 deletions
diff --git a/source4/lib/ldb/Makefile.in b/source4/lib/ldb/Makefile.in
index d3e027425b..756beb1fed 100644
--- a/source4/lib/ldb/Makefile.in
+++ b/source4/lib/ldb/Makefile.in
@@ -19,6 +19,7 @@ SWIG = swig
EXTRA_OBJ=@EXTRA_OBJ@
TESTS=test-tdb.sh @TESTS@
PACKAGE_VERSION = @PACKAGE_VERSION@
+PYTHON = @PYTHON@
PYTHON_CONFIG = @PYTHON_CONFIG@
tdbdir = @tdbdir@
ldbdir = $(srcdir)
diff --git a/source4/lib/tdb/Makefile.in b/source4/lib/tdb/Makefile.in
index 8c79f6e24c..4a95fdb380 100644
--- a/source4/lib/tdb/Makefile.in
+++ b/source4/lib/tdb/Makefile.in
@@ -32,11 +32,13 @@ tdbdir = @tdbdir@
TDB_OBJ = @TDB_OBJ@ @LIBREPLACEOBJ@
-all:: showflags dirs $(PROGS) $(SOLIB) libtdb.a $(PYTHON_BUILD_TARGET)
+default: all
include $(tdbdir)/tdb.mk
include $(tdbdir)/rules.mk
+all:: showflags dirs $(PROGS) $(SOLIB) libtdb.a $(PYTHON_BUILD_TARGET)
+
install:: all
$(SOLIB): $(TDB_OBJ)
$(SHLD) $(SHLD_FLAGS) -o $@ $(TDB_OBJ) @SONAMEFLAG@$(SONAME)