diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-02-18 20:04:18 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-02-18 20:04:18 +0100 |
| commit | ff0315ba859421dff6aba055887e086fa68c2951 (patch) | |
| tree | 47383a8bc299a4cdca8276cf3017ab8ee5c89f35 /source4/build | |
| parent | 094769618e180cae404f5951b969e9c6c778e421 (diff) | |
| download | samba-ff0315ba859421dff6aba055887e086fa68c2951.tar.gz samba-ff0315ba859421dff6aba055887e086fa68c2951.tar.bz2 samba-ff0315ba859421dff6aba055887e086fa68c2951.zip | |
Rename include to mkinclude to emphasize it is different from make's include.
(This used to be commit 0e1d0a874ae3d22b8f97a79b81fe0af3ef53a771)
Diffstat (limited to 'source4/build')
| -rw-r--r-- | source4/build/m4/public.m4 | 2 | ||||
| -rw-r--r-- | source4/build/smb_build/config_mk.pm | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source4/build/m4/public.m4 b/source4/build/m4/public.m4 index f3d262e07a..eb673446c7 100644 --- a/source4/build/m4/public.m4 +++ b/source4/build/m4/public.m4 @@ -131,7 +131,7 @@ dnl SMB_INCLUDE_MK(file) AC_DEFUN([SMB_INCLUDE_MK], [ SMB_INFO_EXT_LIBS="$SMB_INFO_EXT_LIBS -include $1 +mkinclude $1 " ]) diff --git a/source4/build/smb_build/config_mk.pm b/source4/build/smb_build/config_mk.pm index ed05a4e4d9..4d8db8a04e 100644 --- a/source4/build/smb_build/config_mk.pm +++ b/source4/build/smb_build/config_mk.pm @@ -239,7 +239,7 @@ sub run_config_mk($$$$) } # include - if ($line =~ /^include (.*)$/) { + if ($line =~ /^mkinclude (.*)$/) { my $subfile= $1; my $subdir = dirname($filename); $subdir =~ s/^\.$//g; |