summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
authorAdam Mitz <mitza-oci@users.noreply.github.com>2012-03-08 22:42:36 +0000
committerAdam Mitz <mitza-oci@users.noreply.github.com>2012-03-08 22:42:36 +0000
commit8bd6954207f43c64ce80c0b66810605bad4df4b9 (patch)
tree5c0e2d589b064b3531e12c29e056011b8955f439 /modules
parent4869b7c3c2c4889cfbe76b7141469e0c28dc8ce8 (diff)
downloadMPC-8bd6954207f43c64ce80c0b66810605bad4df4b9.tar.gz
ChangeLogTag: Thu Mar 8 22:41:34 UTC 2012 Adam Mitz <mitza@ociweb.com>
Diffstat (limited to 'modules')
-rw-r--r--modules/Depgen/Preprocessor.pm7
1 files changed, 4 insertions, 3 deletions
diff --git a/modules/Depgen/Preprocessor.pm b/modules/Depgen/Preprocessor.pm
index f7c05a5f..bb6f650a 100644
--- a/modules/Depgen/Preprocessor.pm
+++ b/modules/Depgen/Preprocessor.pm
@@ -78,8 +78,9 @@ sub process {
/^\s*#\s*include\s+[<"]([^">]+)[">]/o) {
## Locate the include file
my $inc;
- if (exists $self->{'ifound'}->{$1}) {
- $inc = $self->{'ifound'}->{$1};
+ if (exists $self->{'ifound'}->{$dir} &&
+ exists $self->{'ifound'}->{$dir}->{$1}) {
+ $inc = $self->{'ifound'}->{$dir}->{$1};
}
else {
foreach my $dirp (@{$self->{'ipaths'}}) {
@@ -97,7 +98,7 @@ sub process {
$inc = "$dir/$1";
}
}
- $self->{'ifound'}->{$1} = $inc;
+ $self->{'ifound'}->{$dir}->{$1} = $inc;
}
## If we've found the include file, then process it too.