diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-09-16 17:22:03 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-09-16 17:22:03 +0200 |
| commit | cda87628bc607d6aba1ee9c8a904c86080c974d8 (patch) | |
| tree | 1ef59fd7b789eb1f79ad1ebf968a6cd3d2e9075c | |
| parent | 9ef623beda5d6a7507ff6c871117c8f88e547441 (diff) | |
| download | samba-cda87628bc607d6aba1ee9c8a904c86080c974d8.tar.gz samba-cda87628bc607d6aba1ee9c8a904c86080c974d8.tar.bz2 samba-cda87628bc607d6aba1ee9c8a904c86080c974d8.zip | |
Fix merged build.
| -rw-r--r-- | source3/samba4.m4 | 2 | ||||
| -rw-r--r-- | source3/samba4.mk | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/source3/samba4.m4 b/source3/samba4.m4 index 0a75ba72e6..19d3cc141b 100644 --- a/source3/samba4.m4 +++ b/source3/samba4.m4 @@ -31,7 +31,7 @@ AC_CONFIG_FILES(../source4/librpc/dcerpc_atsvc.pc) SMB_EXT_LIB_FROM_PKGCONFIG(LIBTALLOC, talloc >= 1.2.0, [], [ - SMB_INCLUDE_MK(lib/talloc/config.mk) + SMB_INCLUDE_MK(../talloc/config.mk) ] ) diff --git a/source3/samba4.mk b/source3/samba4.mk index 45089dfaea..d8cf457004 100644 --- a/source3/samba4.mk +++ b/source3/samba4.mk @@ -81,8 +81,8 @@ libmessagingsrcdir := $(samba4srcdir)/lib/messaging libeventssrcdir := $(samba4srcdir)/lib/events libcmdlinesrcdir := $(samba4srcdir)/lib/cmdline poptsrcdir := $(samba4srcdir)/../popt -socketwrappersrcdir := $(samba4srcdir)/lib/socket_wrapper -nsswrappersrcdir := $(samba4srcdir)/lib/nss_wrapper +socketwrappersrcdir := $(samba4srcdir)/../socket_wrapper +nsswrappersrcdir := $(samba4srcdir)/../nss_wrapper appwebsrcdir := $(samba4srcdir)/lib/appweb libstreamsrcdir := $(samba4srcdir)/lib/stream libutilsrcdir := $(samba4srcdir)/lib/util @@ -113,9 +113,9 @@ pyscriptsrcdir := $(samba4srcdir)/scripting/python kdcsrcdir := $(samba4srcdir)/kdc smbreadlinesrcdir := $(samba4srcdir)/lib/smbreadline ntp_signdsrcdir := $(samba4srcdir)/ntp_signd -tdbsrcdir := $(samba4srcdir)/lib/tdb -ldbsrcdir := $(samba4srcdir)/lib/ldb -tallocsrcdir := $(samba4srcdir)/lib/talloc +tdbsrcdir := $(samba4srcdir)/../tdb +ldbsrcdir := $(samba4srcdir)/../ldb +tallocsrcdir := $(samba4srcdir)/../talloc override ASN1C = bin/asn1_compile4 override ET_COMPILER = bin/compile_et4 include samba4-data.mk |