summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rwxr-xr-xprj_install.pl2
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 30e48ab1..bd5ed1d8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Tue Sep 14 19:38:30 UTC 2010 Adam Mitz <mitza@ociweb.com>
+
+ * prj_install.pl:
+
+ Fixed a bug in the symlink-detection logic when the same file appears
+ in more than one MPC component list.
+
Mon Sep 13 21:51:32 UTC 2010 Adam Mitz <mitza@ociweb.com>
* docs/templates/vc8csharp.txt:
diff --git a/prj_install.pl b/prj_install.pl
index 44e08fca..3f8d1ef6 100755
--- a/prj_install.pl
+++ b/prj_install.pl
@@ -88,7 +88,7 @@ sub copyFiles {
foreach my $file (@$files) {
if (-l $file) {
my $dest = readlink($file);
- if (exists $linkTargets{$dest}) {
+ if (exists $linkTargets{$dest} && $file ne $linkTargets{$dest}) {
if (length $file <= length $linkTargets{$dest}) {
$localLink{$file} = $linkTargets{$dest};
}