Fix for bug #8998 - Notify code can miss a ChDir.

[samba.git] / source4 / Makefile

diff --git a/source4/Makefile b/source4/Makefile
index 62fb9d4422df9d5d8e73b14a6de3100ee0563591..03b4e7364aa3b3fc3a06a9be58802de306dfec40 100644 (file)
--- a/source4/Makefile
+++ b/source4/Makefile
@@ -47,6 +47,8 @@ ALL_PREDEP = basics
 .NOTPARALLEL:
 endif
 
+base_srcdirs = $(srcdir) ../librpc/ ../lib/ ../libcli ../libgpo ../nsswitch ../libds
+
 include $(srcdir)/build/make/rules.mk
 include $(srcdir)/build/make/python.mk
 zlibsrcdir := ../lib/zlib
@@ -75,6 +77,7 @@ libcmdlinesrcdir := lib/cmdline
 poptsrcdir := ../lib/popt
 socketwrappersrcdir := ../lib/socket_wrapper
 nsswrappersrcdir := ../lib/nss_wrapper
+uidwrappersrcdir := ../lib/uid_wrapper
 appwebsrcdir := lib/appweb
 libstreamsrcdir := lib/stream
 libutilsrcdir := ../lib/util
@@ -115,8 +118,7 @@ INSTALL_SCRIPTS = $(addprefix scripting/bin/, \
        autoidl \
        samba3dump \
        rpcclient \
-       smbstatus \
-       epdump)
+       smbstatus)
 
 $(foreach SCRIPT,$(INSTALL_SCRIPTS),$(eval $(call binary_install_template,$(SCRIPT))))
 
@@ -153,7 +155,7 @@ include $(srcdir)/static_deps.mk
 endif
 
 clean::
-       @find ../lib ../libcli ../librpc ../libgpo ../nsswitch -name '*.o' -o -name '*.ho' | xargs rm -f
+       @find $(base_srcdirs) -name '*.o' -o -name '*.ho' | xargs rm -f
 
 PUBLIC_HEADERS += ./version.h
 
@@ -164,7 +166,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