diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2008-02-19 14:45:23 +1100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2008-02-19 14:45:23 +1100 |
| commit | e51ec1d8cfbcce0dbc1b4bbe95eef73feffbd1a1 (patch) | |
| tree | 643566bbcf1312cd9ae1fed9e235d702c7281a8f /source4/build/smb_build/config_mk.pm | |
| parent | 5842df9d0fb71430d1bcda1c4c748589b38ecb00 (diff) | |
| parent | 9368ea67cdbb0d1fe5ef2258cc7e8c20c66e6ecd (diff) | |
| download | samba-e51ec1d8cfbcce0dbc1b4bbe95eef73feffbd1a1.tar.gz samba-e51ec1d8cfbcce0dbc1b4bbe95eef73feffbd1a1.tar.bz2 samba-e51ec1d8cfbcce0dbc1b4bbe95eef73feffbd1a1.zip | |
Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-abartlet
(This used to be commit 837eb8a0bc011cd84bc7e8d2849028313d709928)
Diffstat (limited to 'source4/build/smb_build/config_mk.pm')
| -rw-r--r-- | source4/build/smb_build/config_mk.pm | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/source4/build/smb_build/config_mk.pm b/source4/build/smb_build/config_mk.pm index aa075490bc..4d8db8a04e 100644 --- a/source4/build/smb_build/config_mk.pm +++ b/source4/build/smb_build/config_mk.pm @@ -18,7 +18,6 @@ my $section_types = { "CFLAGS" => "list", "CPPFLAGS" => "list", "LDFLAGS" => "list", - "PC_NAME" => "string", }, "PYTHON" => { SWIG_FILE => "string", @@ -90,7 +89,6 @@ my $section_types = { "SO_VERSION" => "string", "LIBRARY_REALNAME" => "string", - "PC_NAME" => "string", "PC_FILE" => "string", "INIT_FUNCTION_TYPE" => "string", @@ -241,7 +239,7 @@ sub run_config_mk($$$$) } # include - if ($line =~ /^include (.*)$/) { + if ($line =~ /^mkinclude (.*)$/) { my $subfile= $1; my $subdir = dirname($filename); $subdir =~ s/^\.$//g; |