diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-12-16 15:36:53 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-12-16 15:36:53 +0100 |
| commit | a7109b183b555ee795c3e32c63e2647025705fc1 (patch) | |
| tree | bc118e6f1dd72466367a4aa9b31df08f253eaa07 /source3/samba4.mk | |
| parent | 0f04beff337a936a66c86272ff79defd9e8ae173 (diff) | |
| parent | 9e64ed018e5aa84d802b01953b481fbb07eb00aa (diff) | |
| download | samba-a7109b183b555ee795c3e32c63e2647025705fc1.tar.gz samba-a7109b183b555ee795c3e32c63e2647025705fc1.tar.bz2 samba-a7109b183b555ee795c3e32c63e2647025705fc1.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Diffstat (limited to 'source3/samba4.mk')
| -rw-r--r-- | source3/samba4.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/samba4.mk b/source3/samba4.mk index 38d1ec2e19..18f7541333 100644 --- a/source3/samba4.mk +++ b/source3/samba4.mk @@ -70,7 +70,7 @@ smbdsrcdir := $(samba4srcdir)/smbd clustersrcdir := $(samba4srcdir)/cluster libnetsrcdir := $(samba4srcdir)/libnet authsrcdir := $(samba4srcdir)/auth -nsswitchsrcdir := $(samba4srcdir)/nsswitch +nsswitchsrcdir := $(samba4srcdir)/../nsswitch libsrcdir := $(samba4srcdir)/lib libsocketsrcdir := $(samba4srcdir)/lib/socket libcharsetsrcdir := $(samba4srcdir)/../lib/util/charset @@ -161,7 +161,7 @@ modules:: $(PLUGINS) pythonmods:: $(PYTHON_PYS) $(PYTHON_SO) -all:: bin/samba4 bin/regpatch4 bin/regdiff4 bin/regshell4 bin/regtree4 bin/smbclient4 pythonmods setup +all:: bin/samba4 bin/regpatch4 bin/regdiff4 bin/regshell4 bin/regtree4 bin/smbclient4 bin/wbinfo4 pythonmods setup torture:: bin/smbtorture4 everything:: $(patsubst %,%4,$(BINARIES)) setup: |