summaryrefslogtreecommitdiff
path: root/source4/build/smb_build/output.pm
diff options
context:
space:
mode:
Diffstat (limited to 'source4/build/smb_build/output.pm')
-rw-r--r--source4/build/smb_build/output.pm9
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);
}