From 1c73f2f743f184f90c67ca4c715be67dd35f93d7 Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 7 Apr 2005 13:48:20 -0400 Subject: BUG: Fix rule name for subdirectory traversal to use relative paths. This was broken by the recent subdirectory changes. --- Source/cmLocalUnixMakefileGenerator2.cxx | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Source/cmLocalUnixMakefileGenerator2.cxx b/Source/cmLocalUnixMakefileGenerator2.cxx index 1524b51..6b7f547 100644 --- a/Source/cmLocalUnixMakefileGenerator2.cxx +++ b/Source/cmLocalUnixMakefileGenerator2.cxx @@ -1313,18 +1313,19 @@ cmLocalUnixMakefileGenerator2 { if(!(*i)->GetExcludeAll()) { + // Construct the name of the subdirectory relative to this + // directory. + std::string subdir = + this->ConvertToRelativePath((*i)->GetMakefile()->GetStartOutputDirectory()); + // Add the subdirectory rule either for pre-order or post-order. if((*i)->GetMakefile()->GetPreOrder()) { - this->WriteSubdirRule(makefileStream, pass, - (*i)->GetMakefile()->GetStartOutputDirectory(), - lastPre); + this->WriteSubdirRule(makefileStream, pass, subdir.c_str(), lastPre); } else { - this->WriteSubdirRule(makefileStream, pass, - (*i)->GetMakefile()->GetStartOutputDirectory(), - lastPost); + this->WriteSubdirRule(makefileStream, pass, subdir.c_str(), lastPost); } } } -- cgit v0.12