diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-02-26 00:40:40 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-02-26 00:40:40 +0100 |
| commit | 6fece9358b35c117203a015389f7f086b372b0af (patch) | |
| tree | 0ebba2124522dd9cf9c55e347625eb249aeec46d /source4/build/smb_build/output.pm | |
| parent | 5b0670ea534a53ce9192f72cfc21018cfaff2aac (diff) | |
| download | samba-6fece9358b35c117203a015389f7f086b372b0af.tar.gz samba-6fece9358b35c117203a015389f7f086b372b0af.tar.bz2 samba-6fece9358b35c117203a015389f7f086b372b0af.zip | |
Fix the build.
(This used to be commit 59bf804ef64d87fa76fe41063f91c35cf805a779)
Diffstat (limited to 'source4/build/smb_build/output.pm')
| -rw-r--r-- | source4/build/smb_build/output.pm | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/source4/build/smb_build/output.pm b/source4/build/smb_build/output.pm index 8b356f9df5..eec438b108 100644 --- a/source4/build/smb_build/output.pm +++ b/source4/build/smb_build/output.pm @@ -137,11 +137,12 @@ sub create_output($$) # Combine object lists if (defined($part->{OBJ_FILES})) { - my $list = "\$(addprefix $part->{BASEDIR}/, " . join(" ", @{$part->{OBJ_FILES}}) . ")"; + my $list; - if ($list =~ /\.\.\//) { - $list = "\$(abspath $list)"; - } + $list = join(" ", @{$part->{OBJ_FILES}}); + unless ($list =~ /^\.\//) { + $list = "\$(addprefix $part->{BASEDIR}/, $list)" + } push(@{$part->{OBJ_LIST}}, $list); } |