summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorBjörn Jacke <bj@sernet.de>2009-07-04 01:07:15 +0200
committerBjörn Jacke <bj@sernet.de>2009-07-04 01:14:24 +0200
commit077808f91610e70c2105b837a2704842191d1e3c (patch)
treef351e255de776b8b3234f42a0e72d8a8d917f399 /source4
parentcfacece9ed96dc46c12f20990110c6528080bc32 (diff)
downloadsamba-077808f91610e70c2105b837a2704842191d1e3c.tar.gz
samba-077808f91610e70c2105b837a2704842191d1e3c.tar.bz2
samba-077808f91610e70c2105b837a2704842191d1e3c.zip
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
Diffstat (limited to 'source4')
-rw-r--r--source4/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/source4/Makefile b/source4/Makefile
index d6ce5170ca..d6ae887066 100644
--- a/source4/Makefile
+++ b/source4/Makefile
@@ -163,7 +163,7 @@ manpages:: $(MANPAGES)
all:: showflags $(ALL_PREDEP) binaries modules pythonmods libraries headers
everything:: all
-LD_LIBPATH_OVERRIDE = $(LIB_PATH_VAR)=$(shliboutputdir)
+LD_LIBPATH_OVERRIDE = $(LIB_PATH_VAR)=$(shliboutputdir):$$$(LIB_PATH_VAR)
# 'make testsuite' creates all binaries which are
# needed by samba3's 'make test' and the build-farm