summaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
Diffstat (limited to 'Source')
-rw-r--r--Source/cmLocalUnixMakefileGenerator2.cxx6
1 files changed, 4 insertions, 2 deletions
diff --git a/Source/cmLocalUnixMakefileGenerator2.cxx b/Source/cmLocalUnixMakefileGenerator2.cxx
index 99acf28..c55831c 100644
--- a/Source/cmLocalUnixMakefileGenerator2.cxx
+++ b/Source/cmLocalUnixMakefileGenerator2.cxx
@@ -2022,14 +2022,16 @@ cmLocalUnixMakefileGenerator2::ConvertToRelativePath(const char* p)
}
// If the entire path is in common then just return a ".".
- if(common == path.size())
+ if(common == path.size() &&
+ common == m_CurrentOutputDirectoryComponents.size())
{
return ".";
}
// If the entire path is in common except for a trailing slash then
// just return a "./".
- if(common+1 == path.size() && path[common].size() == 0)
+ if(common+1 == path.size() && path[common].size() == 0 &&
+ common == m_CurrentOutputDirectoryComponents.size())
{
return "./";
}