From 077808f91610e70c2105b837a2704842191d1e3c Mon Sep 17 00:00:00 2001 From: Björn Jacke Date: Sat, 4 Jul 2009 01:07:15 +0200 Subject: s3/s4:build: honor library path from environment we may not throw away LD_LIBRARY_PATH and friends as they sometimes contain important information. Some of the build farm machines for example have the python lib path in there - we can't run make test when we suddenly forget how to use python --- source3/samba4.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/samba4.mk') diff --git a/source3/samba4.mk b/source3/samba4.mk index e63a8453c0..653ae25464 100644 --- a/source3/samba4.mk +++ b/source3/samba4.mk @@ -172,7 +172,7 @@ everything:: $(patsubst %,%4,$(BINARIES)) setup: @ln -sf ../source4/setup setup -S4_LD_LIBPATH_OVERRIDE = $(LIB_PATH_VAR)="$(builddir)/bin/shared" +S4_LD_LIBPATH_OVERRIDE = $(LIB_PATH_VAR)="$(builddir)/bin/shared:$$$(LIB_PATH_VAR)" SELFTEST4 = $(S4_LD_LIBPATH_OVERRIDE) EXEEXT="4" PYTHON="$(PYTHON)" PERL="$(PERL)" \ $(PERL) $(selftestdir)/selftest.pl --prefix=st4 \ -- cgit