From 16502898b6dbc8e34b1eb6aaba4dfbaa5c25d56e Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 25 Feb 2008 21:34:13 +0100
Subject: Use make's $(call) feature. (This used to be commit
 4046ec8be08bb940ec60390c4f2e1719e14b858d)

---
 source4/build/smb_build/output.pm | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'source4/build/smb_build/output.pm')

diff --git a/source4/build/smb_build/output.pm b/source4/build/smb_build/output.pm
index 6e8803fa23..8b356f9df5 100644
--- a/source4/build/smb_build/output.pm
+++ b/source4/build/smb_build/output.pm
@@ -137,7 +137,11 @@ sub create_output($$)
 
 		# Combine object lists
 		if (defined($part->{OBJ_FILES})) {
-			my $list = "\$(abspath \$(addprefix $part->{BASEDIR}/, " . join(" ", @{$part->{OBJ_FILES}}) . "))";
+			my $list = "\$(addprefix $part->{BASEDIR}/, " . join(" ", @{$part->{OBJ_FILES}}) . ")";
+
+			if ($list =~ /\.\.\//) {
+				$list = "\$(abspath $list)";
+			}
 			push(@{$part->{OBJ_LIST}}, $list);
 		}
 
-- 
cgit