[cmake-commits] king committed cmMakefileTargetGenerator.cxx 1.46 1.47

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv17485/Source

Modified Files:
	cmMakefileTargetGenerator.cxx 
Log Message:
BUG: Fixed out-of-source subdirectories to work when they are also out-of-binary.  Updated the OutOfSource test to test this feature.


Index: cmMakefileTargetGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmMakefileTargetGenerator.cxx,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- cmMakefileTargetGenerator.cxx	2 Oct 2006 14:20:53 -0000	1.46
+++ cmMakefileTargetGenerator.cxx	10 Oct 2006 01:25:58 -0000	1.47
@@ -1048,9 +1048,8 @@
                                                       bool relink)
 {
   // Compute the name of the driver target.
-  std::string dir = this->Makefile->GetStartOutputDirectory();
-  dir += "/";
-  dir += this->LocalGenerator->GetTargetDirectory(*this->Target);
+  std::string dir =
+    this->LocalGenerator->GetRelativeTargetDirectory(*this->Target);
   std::string buildTargetRuleName = dir;
   buildTargetRuleName += relink?"/preinstall":"/build";
   buildTargetRuleName = this->Convert(buildTargetRuleName.c_str(),