[cmake-commits] hoffman committed cmCPackGenerator.cxx 1.2 1.3

[cmake-commits at cmake.org]

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

Modified Files:
	cmCPackGenerator.cxx 
Log Message:
ENH: fix DESTDIR install


Index: cmCPackGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CPack/cmCPackGenerator.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- cmCPackGenerator.cxx	6 Nov 2007 13:28:26 -0000	1.2
+++ cmCPackGenerator.cxx	16 Feb 2008 18:02:57 -0000	1.3
@@ -395,13 +395,12 @@
         // underneath the tempInstallDirectory. The value of the project's
         // CMAKE_INSTALL_PREFIX is sent in here as the value of the
         // CPACK_INSTALL_PREFIX variable.
-        std::string dir = tempInstallDirectory;
+       std::string dir;
         if (this->GetOption("CPACK_INSTALL_PREFIX"))
           {
           dir += this->GetOption("CPACK_INSTALL_PREFIX");
           }
         this->SetOption("CMAKE_INSTALL_PREFIX", dir.c_str());
-
         cmCPackLogger(cmCPackLog::LOG_DEBUG,
           "- Using DESTDIR + CPACK_INSTALL_PREFIX... (this->SetOption)"
           << std::endl);
@@ -555,7 +554,7 @@
         // underneath the tempInstallDirectory. The value of the project's
         // CMAKE_INSTALL_PREFIX is sent in here as the value of the
         // CPACK_INSTALL_PREFIX variable.
-        std::string dir = tempInstallDirectory;
+        std::string dir;
         if (this->GetOption("CPACK_INSTALL_PREFIX"))
           {
           dir += this->GetOption("CPACK_INSTALL_PREFIX");