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 /source4/Makefile | |
| parent | a347ab83f447d7921d5d427e56f6965342b25834 (diff) | |
| parent | c8bff39df639c70afc94b1795c94629ee8b7b482 (diff) | |
| download | samba-9ef623beda5d6a7507ff6c871117c8f88e547441.tar.gz samba-9ef623beda5d6a7507ff6c871117c8f88e547441.tar.bz2 samba-9ef623beda5d6a7507ff6c871117c8f88e547441.zip | |
Merge branch 'singlepopt' into single
Conflicts:
source4/Makefile
Diffstat (limited to 'source4/Makefile')
| -rw-r--r-- | source4/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source4/Makefile b/source4/Makefile index 8f81055324..7679786acb 100644 --- a/source4/Makefile +++ b/source4/Makefile @@ -70,7 +70,7 @@ smbreadlinesrcdir := lib/smbreadline libmessagingsrcdir := lib/messaging libeventssrcdir := lib/events libcmdlinesrcdir := lib/cmdline -poptsrcdir := lib/popt +poptsrcdir := ../popt socketwrappersrcdir := ../socket_wrapper nsswrappersrcdir := ../nss_wrapper appwebsrcdir := lib/appweb |