summaryrefslogtreecommitdiff
path: root/source4/build/smb_build/makefile.pm
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-02-26 02:45:12 +0100
committerJelmer Vernooij <jelmer@samba.org>2008-02-26 02:45:12 +0100
commit895a0a3238e1f17f39ab0e4543dbd6318d6f8f11 (patch)
treedca92494efd2e7e571c8413e7c0b5f98da23f0ce /source4/build/smb_build/makefile.pm
parent22ef67dd136f0a67885a17be68909643dc97304d (diff)
downloadsamba-895a0a3238e1f17f39ab0e4543dbd6318d6f8f11.tar.gz
samba-895a0a3238e1f17f39ab0e4543dbd6318d6f8f11.tar.bz2
samba-895a0a3238e1f17f39ab0e4543dbd6318d6f8f11.zip
Move more code out of perl.
(This used to be commit ad258e86353250fd447d461c94649c1541b37844)
Diffstat (limited to 'source4/build/smb_build/makefile.pm')
-rw-r--r--source4/build/smb_build/makefile.pm2
1 files changed, 1 insertions, 1 deletions
diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm
index c2a0c2287e..13c28de697 100644
--- a/source4/build/smb_build/makefile.pm
+++ b/source4/build/smb_build/makefile.pm
@@ -228,7 +228,7 @@ sub MergedObj($$)
return unless defined($ctx->{OUTPUT});
$self->output("$ctx->{NAME}_OUTPUT = $ctx->{OUTPUT}\n");
- $self->output("\$(call partial_link_template, $ctx->{RESULT_MERGED_OBJ}, \$($ctx->{NAME}_OBJ_LIST))\n");
+ $self->output("\$(call partial_link_template, \$($ctx->{NAME}_OUTPUT), \$($ctx->{NAME}_OBJ_LIST))\n");
}
sub StaticLibraryPrimitives($$)