fix libclinbtsrcdir variable.

diff --git a/source3/samba4.mk b/source3/samba4.mk
index 3abcbe121fd0aab8b395e8d43c145cc94285c87e..524fc9f64ce1ed7f761395734167c6cfae0a5492 100644 (file)
--- a/source3/samba4.mk
+++ b/source3/samba4.mk
@@ -107,7 +107,7 @@ ntvfssrcdir := $(samba4srcdir)/ntvfs
 ntptrsrcdir := $(samba4srcdir)/ntptr
 clientsrcdir := $(samba4srcdir)/client
 libclisrcdir := $(samba4srcdir)/libcli
-libclinbtsrcdir := $(samba4srcdir)/../libcli
+libclinbtsrcdir := $(samba4srcdir)/../libcli/nbt
 pyscriptsrcdir := $(samba4srcdir)/scripting/python
 kdcsrcdir := $(samba4srcdir)/kdc
 smbreadlinesrcdir := $(samba4srcdir)/lib/smbreadline

diff --git a/source4/Makefile b/source4/Makefile
index 74383b1a59ee3ef65fa3a4f1606fd4a91cec4c2d..cab82674d212d4ebdc9c4f713b326e784fa86aaf 100644 (file)
--- a/source4/Makefile
+++ b/source4/Makefile
@@ -97,7 +97,7 @@ ntvfssrcdir := ntvfs
 ntptrsrcdir := ntptr
 librpcsrcdir := librpc
 libclisrcdir := libcli
-libclinbtsrcdir := ../libcli
+libclinbtsrcdir := ../libcli/nbt
 pyscriptsrcdir := $(srcdir)/scripting/python
 kdcsrcdir := kdc
 ntp_signdsrcdir := ntp_signd

diff --git a/source4/libcli/config.mk b/source4/libcli/config.mk
index 8e8587ffa49c58c45491da8eae89d3e84ee195f2..8d9a1f5fa8bf4063da21d487dcaa0921dd9ac8ee 100644 (file)
--- a/source4/libcli/config.mk
+++ b/source4/libcli/config.mk
@@ -40,15 +40,15 @@ $(eval $(call proto_header_template,$(libclisrcdir)/smb_composite/proto.h,$(LIBC
 
 [SUBSYSTEM::NDR_NBT_BUF]
 
-NDR_NBT_BUF_OBJ_FILES = $(libclinbtsrcdir)/nbt/nbtname.o
+NDR_NBT_BUF_OBJ_FILES = $(libclinbtsrcdir)/nbtname.o
 
-$(eval $(call proto_header_template,$(libclinbtsrcdir)/nbt/nbtname.h,$(NDR_NBT_BUF_OBJ_FILES:.o=.c)))
+$(eval $(call proto_header_template,$(libclinbtsrcdir)/nbtname.h,$(NDR_NBT_BUF_OBJ_FILES:.o=.c)))
 
 [SUBSYSTEM::LIBCLI_NBT]
 PUBLIC_DEPENDENCIES = LIBNDR NDR_NBT LIBCLI_COMPOSITE LIBEVENTS \
        NDR_SECURITY samba-socket LIBSAMBA-UTIL
 
-LIBCLI_NBT_OBJ_FILES = $(addprefix $(libclinbtsrcdir)/nbt/, \
+LIBCLI_NBT_OBJ_FILES = $(addprefix $(libclinbtsrcdir)/, \
        nbtsocket.o \
        namequery.o \
        nameregister.o \
@@ -73,19 +73,19 @@ MANPAGES += $(libclinbtsrcdir)/man/nmblookup.1
 PUBLIC_DEPENDENCIES = LIBNDR  \
        NDR_SECURITY    
 
-LIBCLI_NDR_NETLOGON_OBJ_FILES = $(addprefix $(libclinbtsrcdir)/, ndr_netlogon.o)
+LIBCLI_NDR_NETLOGON_OBJ_FILES = $(addprefix $(libclinbtsrcdir)/../, ndr_netlogon.o)
 
 [SUBSYSTEM::LIBCLI_NETLOGON]
 PUBLIC_DEPENDENCIES = LIBSAMBA-UTIL LIBCLI_NDR_NETLOGON
 
 LIBCLI_NETLOGON_OBJ_FILES = $(addprefix $(libclinbtsrcdir)/, \
-       netlogon.o)
+       ../netlogon.o)
 
 [PYTHON::python_netbios]
 LIBRARY_REALNAME = samba/netbios.$(SHLIBEXT)
 PUBLIC_DEPENDENCIES = LIBCLI_NBT DYNCONFIG LIBSAMBA-HOSTCONFIG
 
-python_netbios_OBJ_FILES = $(libclinbtsrcdir)/nbt/pynbt.o
+python_netbios_OBJ_FILES = $(libclinbtsrcdir)/pynbt.o
 
 $(python_libcli_nbt_OBJ_FILES): CFLAGS+=$(CFLAG_NO_UNUSED_MACROS) $(CFLAG_NO_CAST_QUAL)