[Cmake-commits] CMake branch, next, updated. v2.8.9-64-ga95c96f

[Peter Kuemmel]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  a95c96f4c247a8643403cd546f381c07cc4b9e4d (commit)
       via  7ad5598b3c0d0ffce5f4bedba9e77a191bb5780f (commit)
      from  5e9e371569dd5646bb0da5cf51853604c9a9fdc8 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a95c96f4c247a8643403cd546f381c07cc4b9e4d
commit a95c96f4c247a8643403cd546f381c07cc4b9e4d
Merge: 5e9e371 7ad5598
Author:     Peter Kuemmel <syntheticpp at gmx.net>
AuthorDate: Tue Aug 14 10:57:48 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Aug 14 10:57:48 2012 -0400

    Merge topic 'cpack-stripping' into next
    
    7ad5598 Bug 0011785: DESTDIR is a dir but file could be a var without a leading slash


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7ad5598b3c0d0ffce5f4bedba9e77a191bb5780f
commit 7ad5598b3c0d0ffce5f4bedba9e77a191bb5780f
Author:     Peter Kuemmel <syntheticpp at gmx.net>
AuthorDate: Tue Aug 14 16:44:37 2012 +0200
Commit:     Peter Kuemmel <syntheticpp at gmx.net>
CommitDate: Tue Aug 14 16:44:37 2012 +0200

    Bug 0011785: DESTDIR is a dir but file could be a var without a leading slash

diff --git a/Source/cmInstallTargetGenerator.cxx b/Source/cmInstallTargetGenerator.cxx
index 5f9b658..74011cc 100644
--- a/Source/cmInstallTargetGenerator.cxx
+++ b/Source/cmInstallTargetGenerator.cxx
@@ -455,12 +455,11 @@ std::string cmInstallTargetGenerator::GetDestDirPath(std::string const& file)
   // Construct the path of the file on disk after installation on
   // which tweaks may be performed.
   std::string toDestDirPath = "$ENV{DESTDIR}";
-  if(file[0] != '/' && file[0] != '$')
+  if(file[0] != '/')
     {
     toDestDirPath += "/";
     }
-  toDestDirPath += file;
-  return toDestDirPath;
+  return toDestDirPath + file;
 }
 
 //----------------------------------------------------------------------------

-----------------------------------------------------------------------

Summary of changes:
 Source/cmInstallTargetGenerator.cxx |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake