From a316851494d14cccda32b5870d26de4658834f6b Mon Sep 17 00:00:00 2001 From: Hallvard Furuseth Date: Mon, 5 Sep 2011 21:10:04 +0200 Subject: [PATCH] back-mdb/Makefile.in += variable MDB_SUBDIR. For compiling against a checkout of the stand-alone libmdb, which has a branch 'mdb.master' with its own root: git clone --branch=mdb.master mdb set_mdb="MDB_SUBDIR=`pwd`/mdb/libraries/libmdb" ... maybe modify mdb repository for testing ... cd ; make $set_mdb --- servers/slapd/back-mdb/Makefile.in | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/servers/slapd/back-mdb/Makefile.in b/servers/slapd/back-mdb/Makefile.in index 93cb911f4b..856a40d98b 100644 --- a/servers/slapd/back-mdb/Makefile.in +++ b/servers/slapd/back-mdb/Makefile.in @@ -29,6 +29,7 @@ OBJS = init.lo tools.lo config.lo \ LDAP_INCDIR= ../../../include LDAP_LIBDIR= ../../../libraries +MDB_SUBDIR = $(srcdir)/$(LDAP_LIBDIR)/libmdb BUILD_OPT = "--enable-mdb" BUILD_MOD = @BUILD_MDB@ @@ -43,7 +44,7 @@ UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS) LIBBASE = back_mdb -XINCPATH = -I.. -I$(srcdir)/.. -I$(srcdir)/$(LDAP_LIBDIR)/libmdb +XINCPATH = -I.. -I$(srcdir)/.. -I$(MDB_SUBDIR) XDEFS = $(MODULES_CPPFLAGS) all-local-lib: ../.backend @@ -51,10 +52,10 @@ all-local-lib: ../.backend ../.backend: lib$(LIBBASE).a @touch $@ -mdb.lo: $(srcdir)/$(LDAP_LIBDIR)/libmdb/mdb.c +mdb.lo: $(MDB_SUBDIR)/mdb.c $(LTCOMPILE_MOD) $< -midl.lo: $(srcdir)/$(LDAP_LIBDIR)/libmdb/midl.c +midl.lo: $(MDB_SUBDIR)/midl.c $(LTCOMPILE_MOD) $< veryclean-local-lib: FORCE -- 2.39.5