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 /source4/main.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 'source4/main.mk')
| -rw-r--r-- | source4/main.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source4/main.mk b/source4/main.mk index 0a72487f8a..1d4ffc5d44 100644 --- a/source4/main.mk +++ b/source4/main.mk @@ -6,7 +6,7 @@ mkinclude cluster/config.mk mkinclude smbd/process_model.mk mkinclude libnet/config.mk mkinclude auth/config.mk -mkinclude nsswitch/config.mk +mkinclude ../nsswitch/config.mk mkinclude lib/samba3/config.mk mkinclude lib/socket/config.mk mkinclude ../lib/util/charset/config.mk |