diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-09-16 17:07:11 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-09-16 17:07:11 +0200 |
| commit | a347ab83f447d7921d5d427e56f6965342b25834 (patch) | |
| tree | 68e38df8ccb86498f08809201f132cfe0a598fe5 /source4/Makefile | |
| parent | a8725f18fa5cac16583ba16cd8d54ee1ae492524 (diff) | |
| parent | ca2da6154068c8fb9ef89407d34deb9bb8f5fbfa (diff) | |
| download | samba-a347ab83f447d7921d5d427e56f6965342b25834.tar.gz samba-a347ab83f447d7921d5d427e56f6965342b25834.tar.bz2 samba-a347ab83f447d7921d5d427e56f6965342b25834.zip | |
Merge branch 'singlensswrap' into single
Conflicts:
source3/configure.in
source4/Makefile
source4/configure.ac
source4/lib/nss_wrapper/nss_wrapper.c
source4/lib/replace/system/passwd.h
source4/main.mk
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 8054dc82af..8f81055324 100644 --- a/source4/Makefile +++ b/source4/Makefile @@ -72,7 +72,7 @@ libeventssrcdir := lib/events libcmdlinesrcdir := lib/cmdline poptsrcdir := lib/popt socketwrappersrcdir := ../socket_wrapper -nsswrappersrcdir := lib/nss_wrapper +nsswrappersrcdir := ../nss_wrapper appwebsrcdir := lib/appweb libstreamsrcdir := lib/stream libutilsrcdir := lib/util |