summaryrefslogtreecommitdiff
path: root/modules/AutomakeWorkspaceCreator.pm
diff options
context:
space:
mode:
authorelliott_c <ocielliottc@users.noreply.github.com>2006-07-18 14:38:50 +0000
committerelliott_c <ocielliottc@users.noreply.github.com>2006-07-18 14:38:50 +0000
commit69887c0d1d8cc151fffe65173f364a7e6bc041c1 (patch)
tree9e5cb6c0988ae15de978edfa524ddb06c225f306 /modules/AutomakeWorkspaceCreator.pm
parent798cea1129a76ebb118b6b67bd375b8c99370682 (diff)
downloadMPC-69887c0d1d8cc151fffe65173f364a7e6bc041c1.tar.gz
ChangeLogTag: Tue Jul 18 14:38:01 UTC 2006 Chad Elliott <elliott_c@ociweb.com>
Diffstat (limited to 'modules/AutomakeWorkspaceCreator.pm')
-rw-r--r--modules/AutomakeWorkspaceCreator.pm7
1 files changed, 4 insertions, 3 deletions
diff --git a/modules/AutomakeWorkspaceCreator.pm b/modules/AutomakeWorkspaceCreator.pm
index 2aa06f5b..769a6382 100644
--- a/modules/AutomakeWorkspaceCreator.pm
+++ b/modules/AutomakeWorkspaceCreator.pm
@@ -369,14 +369,15 @@ sub write_comps {
my $libfile = $libs[$i * 2];
my $libname = $libs[$i * 2 + 1];
my $reldir = $$liblocs{$libname};
- if ($reldir) {
- if ("$start/$reldir" ne $here) {
+ if (defined $reldir) {
+ my($append) = ($reldir eq '' ? '' : "/$reldir");
+ if ("$start$append" ne $here) {
my($mod) = $wsHelper->modify_libpath($_, $reldir, $libfile);
if (defined $mod) {
$_ = $mod;
}
else {
- s/$libfile/\$(top_builddir)\/$reldir\/$libfile/;
+ s/$libfile/\$(top_builddir)$append\/$libfile/;
}
}
}