diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-09-16 17:20:54 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-09-16 17:20:54 +0200 |
| commit | 9ef623beda5d6a7507ff6c871117c8f88e547441 (patch) | |
| tree | dff1dc9cb6de1389a9aa18af51349e1fbef90b83 /source3/samba4.mk | |
| parent | a347ab83f447d7921d5d427e56f6965342b25834 (diff) | |
| parent | c8bff39df639c70afc94b1795c94629ee8b7b482 (diff) | |
| download | samba-9ef623beda5d6a7507ff6c871117c8f88e547441.tar.gz samba-9ef623beda5d6a7507ff6c871117c8f88e547441.tar.xz samba-9ef623beda5d6a7507ff6c871117c8f88e547441.zip | |
Merge branch 'singlepopt' into single
Conflicts:
source4/Makefile
Diffstat (limited to 'source3/samba4.mk')
| -rw-r--r-- | source3/samba4.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/samba4.mk b/source3/samba4.mk index 60bbfb595d1..45089dfaeaa 100644 --- a/source3/samba4.mk +++ b/source3/samba4.mk @@ -80,7 +80,7 @@ libregistrysrcdir := $(samba4srcdir)/lib/registry libmessagingsrcdir := $(samba4srcdir)/lib/messaging libeventssrcdir := $(samba4srcdir)/lib/events libcmdlinesrcdir := $(samba4srcdir)/lib/cmdline -poptsrcdir := $(samba4srcdir)/lib/popt +poptsrcdir := $(samba4srcdir)/../popt socketwrappersrcdir := $(samba4srcdir)/lib/socket_wrapper nsswrappersrcdir := $(samba4srcdir)/lib/nss_wrapper appwebsrcdir := $(samba4srcdir)/lib/appweb |