diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2005-10-21 16:29:54 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:45:06 -0500 |
| commit | 4c5a4a7e0288e9ac0b2f795befd5684059e4c429 (patch) | |
| tree | e4ba25456c59c45b535225cae34228f69e3d0551 /source4/build/smb_build/config_mk.pm | |
| parent | 568dd26ac783385c1c2a69a392f5a569ebdd13a2 (diff) | |
| download | samba-4c5a4a7e0288e9ac0b2f795befd5684059e4c429.tar.gz samba-4c5a4a7e0288e9ac0b2f795befd5684059e4c429.tar.bz2 samba-4c5a4a7e0288e9ac0b2f795befd5684059e4c429.zip | |
r11244: Relative path names in .mk files
(This used to be commit 24e10300906c380919d2d631bfb3b8fd6b3f54ba)
Diffstat (limited to 'source4/build/smb_build/config_mk.pm')
| -rw-r--r-- | source4/build/smb_build/config_mk.pm | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source4/build/smb_build/config_mk.pm b/source4/build/smb_build/config_mk.pm index e5c8c293aa..b26e70f88b 100644 --- a/source4/build/smb_build/config_mk.pm +++ b/source4/build/smb_build/config_mk.pm @@ -8,6 +8,7 @@ package smb_build::config_mk; use smb_build::input; +use File::Basename; use strict; @@ -131,7 +132,7 @@ sub run_config_mk($$) # include if ($line =~ /^include (.*)$/) { - $makefile .= run_config_mk($input, $1); + $makefile .= run_config_mk($input, dirname($filename)."/$1"); next; } @@ -171,6 +172,7 @@ sub run_config_mk($$) $input->{$name}{NAME} = $name; $input->{$name}{TYPE} = $type; + $input->{$name}{BASEDIR} = dirname($filename); foreach my $key (values %{$result->{$section}}) { $key->{VAL} = smb_build::input::strtrim($key->{VAL}); |