diff options
| author | marha <marha@users.sourceforge.net> | 2010-02-18 07:22:26 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-02-18 07:22:26 +0000 |
| commit | 24d6ec0750afd0c393bab09aabe174da824a8c56 (patch) | |
| tree | c856ef924b12b5f1a88809208c38438cc874e6a1 /tools/mhmake/src/rule.cpp | |
| parent | 5a30da03ddafd49caf68942f7ddf021bd898ef6d (diff) | |
| download | vcxsrv-24d6ec0750afd0c393bab09aabe174da824a8c56.tar.gz vcxsrv-24d6ec0750afd0c393bab09aabe174da824a8c56.tar.bz2 vcxsrv-24d6ec0750afd0c393bab09aabe174da824a8c56.zip | |
svn merge --reintegrate ^/branches/mhmake.parallel .
Diffstat (limited to 'tools/mhmake/src/rule.cpp')
| -rw-r--r-- | tools/mhmake/src/rule.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/mhmake/src/rule.cpp b/tools/mhmake/src/rule.cpp index 90fee8a91..f9485b560 100644 --- a/tools/mhmake/src/rule.cpp +++ b/tools/mhmake/src/rule.cpp @@ -151,7 +151,7 @@ void IMPLICITRULE::SearchImplicitRule(const refptr<fileinfo> &Target,vector< pai if (!ResIt->first.empty())
{
string Dependent=ReplaceWithStem(ResIt->first,Res.m_Stem);
- Result.push_back(pair<refptr<fileinfo>,refptr<rule> >(GetFileInfo(Dependent),ResIt->second));
+ Result.push_back(pair<refptr<fileinfo>,refptr<rule> >(GetFileInfo(Dependent,ResIt->second->GetMakefile()->GetMakeDir()),ResIt->second));
}
else
Result.push_back(pair<refptr<fileinfo>,refptr<rule> >(NullFileInfo,ResIt->second));
|