summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2011-04-12 18:44:22 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2011-04-12 18:44:22 (GMT)
commitbf4349b23cefa27d8359ff6ea6c70be62759768e (patch)
tree4866e117ed930513427b3f68244eee4d4f5ecfc0
parentf3e48acad0151272a4f6202397160a3e74c70dda (diff)
parentb22fcfb0c55ec145a4cf7405120c708fa136d928 (diff)
downloadCMake-bf4349b23cefa27d8359ff6ea6c70be62759768e.zip
CMake-bf4349b23cefa27d8359ff6ea6c70be62759768e.tar.gz
CMake-bf4349b23cefa27d8359ff6ea6c70be62759768e.tar.bz2
Merge topic 'CPackDeb-fix12061'
b22fcfb CPackDeb: Handle dirs for CONTROL_EXTRA correctly when packaging components
-rw-r--r--Source/CPack/cmCPackDebGenerator.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/CPack/cmCPackDebGenerator.cxx b/Source/CPack/cmCPackDebGenerator.cxx
index 5665404..8c19bbd 100644
--- a/Source/CPack/cmCPackDebGenerator.cxx
+++ b/Source/CPack/cmCPackDebGenerator.cxx
@@ -491,7 +491,7 @@ int cmCPackDebGenerator::createDeb()
{
std::string filenamename =
cmsys::SystemTools::GetFilenameName(i->c_str());
- std::string localcopy = toplevel;
+ std::string localcopy = this->GetOption("WDIR");
localcopy += "/";
localcopy += filenamename;
// if we can copy the file, it means it does exist, let's add it: