s4:upgrade_from_s3 - Fix message outputs

[ira/wip.git] / source4 / Makefile

diff --git a/source4/Makefile b/source4/Makefile
index 267e302c9f790d9ac907935c6910609e83c5df28..8f23da5679cb691b8b3978efca4f43655fcc1353 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
@@ -58,6 +60,7 @@ clustersrcdir := cluster
 libnetsrcdir := libnet
 authsrcdir := auth
 nsswitchsrcdir := ../nsswitch
+libwbclientsrcdir := ../nsswitch/libwbclient
 libsrcdir := lib
 libsocketsrcdir := lib/socket
 libcharsetsrcdir := ../lib/util/charset
@@ -74,10 +77,11 @@ 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
-libtdrsrcdir := lib/tdr
+libtdrsrcdir := ../lib/tdr
 libcryptosrcdir := ../lib/crypto
 libtorturesrcdir := ../lib/torture
 smb_serversrcdir := smb_server
@@ -106,11 +110,10 @@ ntp_signdsrcdir := ntp_signd
 wmisrcdir := lib/wmi
 tallocsrcdir := ../lib/talloc
 comsrcdir := $(srcdir)/lib/com
+libgpodir := libgpo
 
 include data.mk
 
-$(foreach SCRIPT,$(wildcard scripting/bin/*),$(eval $(call binary_install_template,$(SCRIPT))))
-
 $(DESTDIR)$(bindir)/%: scripting/bin/% installdirs
        @mkdir -p $(@D)
        @echo Installing $(@F) as $@
@@ -144,9 +147,9 @@ include $(srcdir)/static_deps.mk
 endif
 
 clean::
-       @find ../lib ../libcli ../librpc ../nsswitch -name '*.o' -o -name '*.ho' | xargs rm -f
+       @find $(base_srcdirs) -name '*.o' -o -name '*.ho' | xargs rm -f
 
-PUBLIC_HEADES += $(srcdir)/version.h
+PUBLIC_HEADERS += ./version.h
 
 libraries:: $(STATIC_LIBS) $(SHARED_LIBS)
 modules:: $(PLUGINS)
@@ -155,7 +158,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
@@ -242,7 +245,7 @@ installman:: manpages installdirs
        @$(SHELL) $(srcdir)/script/installman.sh $(DESTDIR)$(mandir) $(MANPAGES)
 
 installmisc:: installdirs
-       @$(SHELL) $(srcdir)/script/installmisc.sh $(srcdir) $(DESTDIR)$(setupdir)
+       @$(SHELL) $(srcdir)/script/installmisc.sh $(srcdir) $(DESTDIR)$(setupdir) $(DESTDIR)$(bindir) $(DESTDIR)$(sbindir) $(pythondir)
 
 installpc:: installdirs
        @$(SHELL) $(srcdir)/script/installpc.sh $(builddir) $(DESTDIR)$(pkgconfigdir) $(PC_FILES)