From b8917c7e6c6f7ccdd0d54480b9ece74a2aa6d07b Mon Sep 17 00:00:00 2001 From: Brad King Date: Fri, 2 Jul 2004 14:09:53 -0400 Subject: [PATCH] BUG: Fixed generation of installation manifest to account for library versioning symlinks. Also removed DESTDIR prefix from generated manifest. --- Source/cmFileCommand.cxx | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Source/cmFileCommand.cxx b/Source/cmFileCommand.cxx index a1d85b2d2c..75236bad92 100644 --- a/Source/cmFileCommand.cxx +++ b/Source/cmFileCommand.cxx @@ -340,6 +340,7 @@ bool cmFileCommand::HandleInstallCommand( return false; } + int destDirLength = 0; if ( destdir && *destdir ) { std::string sdestdir = destdir; @@ -393,6 +394,7 @@ bool cmFileCommand::HandleInstallCommand( } } destination = sdestdir + (destination.c_str() + skip); + destDirLength = int(sdestdir.size()); } if ( files.size() == 0 ) @@ -517,6 +519,8 @@ bool cmFileCommand::HandleInstallCommand( this->SetError(errstring.c_str()); return false; } + smanifest_files += ";"; + smanifest_files += libname.substr(destDirLength);; if ( destfile != soname ) { if ( !cmSystemTools::CreateSymlink(fname.c_str(), soname.c_str()) ) @@ -525,6 +529,8 @@ bool cmFileCommand::HandleInstallCommand( this->SetError(errstring.c_str()); return false; } + smanifest_files += ";"; + smanifest_files += soname.substr(destDirLength); } } cmOStringStream str; @@ -586,7 +592,8 @@ bool cmFileCommand::HandleInstallCommand( perror(err.str().c_str()); } } - smanifest_files += ";" + destfile; + smanifest_files += ";"; + smanifest_files += destfile.substr(destDirLength); } else {