BUG: Fix bug#4482.

This commit is contained in:
Brad King 2007-02-22 15:27:56 -05:00
parent 8529efdd87
commit 2a64bb4774
1 changed files with 12 additions and 1 deletions

View File

@ -2693,13 +2693,24 @@ kwsys_stl::string SystemTools::RelativePath(const char* local, const char* remot
remoteSplit[sameCount] = "";
sameCount++;
}
#if 0
// NOTE: We did this at one time to prevent relative paths to the
// compiler from looking like "../../../../../../../usr/bin/gcc".
// Now however relative paths are only computed for destinations
// inside the build tree so this is not a problem. This is now a
// general-purpose method and should not have this hack. I'm
// leaving it in place in case removing it causes a problem so it is
// easy to restore:
//
// If there is nothing in common but the root directory, then just
// return the full path.
if(sameCount <= 1)
{
return remote;
}
#endif
// for each entry that is not common in the local path
// add a ../ to the finalpath array, this gets us out of the local
// path into the remote dir