Move the master copy of ldb (from Samba4) to the top level

[abartlet/samba.git/.git] / source4 / Makefile

diff --git a/source4/Makefile b/source4/Makefile
index 508836f6da00d835515bd85339ed2c53e5eb6fa1..104bd09cc4cc948d4d149de70a423c14917741ed 100644 (file)
--- a/source4/Makefile
+++ b/source4/Makefile
@@ -63,7 +63,7 @@ libsocketsrcdir := lib/socket
 libcharsetsrcdir := ../lib/util/charset
 ldb_sambasrcdir := lib/ldb-samba
 tdbsrcdir := ../lib/tdb
-ldbsrcdir := lib/ldb
+ldbsrcdir := ../lib/ldb
 libtlssrcdir := lib/tls
 libregistrysrcdir := lib/registry
 smbreadlinesrcdir := lib/smbreadline
@@ -77,7 +77,7 @@ nsswrappersrcdir := ../lib/nss_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
@@ -146,7 +146,7 @@ endif
 clean::
        @find ../lib ../libcli ../librpc ../nsswitch -name '*.o' -o -name '*.ho' | xargs rm -f
 
-PUBLIC_HEADERS += $(srcdir)/version.h
+PUBLIC_HEADERS += ./version.h
 
 libraries:: $(STATIC_LIBS) $(SHARED_LIBS)
 modules:: $(PLUGINS)