From ed2a1c718ae4fb56fdfe73da6f63ddb7fb15d9fd Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Tue, 11 Sep 2007 15:42:19 +0000 Subject: r25081: Add modules_dir member to ldb_context that is used rather than a global modulesdir setting. Samba always sets this to lp_modulesdir()/ldb (This used to be commit e672380d2156cf0421108a9c34f04f096c2afeed) --- source4/lib/ldb/config.mk | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'source4/lib/ldb/config.mk') diff --git a/source4/lib/ldb/config.mk b/source4/lib/ldb/config.mk index e47bf8ea39..ec74599fd8 100644 --- a/source4/lib/ldb/config.mk +++ b/source4/lib/ldb/config.mk @@ -142,9 +142,16 @@ PRIVATE_DEPENDENCIES = \ ./lib/ldb/common/ldb_modules.o: lib/ldb/common/ldb_modules.c Makefile @echo Compiling $< @$(CC) `$(PERL) $(srcdir)/script/cflags.pl $@` $(CFLAGS) $(PICFLAG) \ - -DLDBMODULESDIR=\"$(MODULESDIR)/ldb\" -DSHLIBEXT=\"$(SHLIBEXT)\" \ + -DSHLIBEXT=\"$(SHLIBEXT)\" \ -c $< -o $@ +./lib/ldb/common/ldb.o: lib/ldb/common/ldb.c Makefile + @echo Compiling $< + @$(CC) `$(PERL) $(srcdir)/script/cflags.pl $@` $(CFLAGS) $(PICFLAG) \ + -DLDB_MODULESDIR=\"$(MODULESDIR)/ldb\" \ + -c $< -o $@ + + ################################################ # Start SUBSYSTEM ldb [LIBRARY::LIBLDB] -- cgit