X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Finstalledfile.cpp;h=f4b8a939832efc0aa150c5bc10196bba9c3f42c2;hb=2992094d86385f06bf9c86bb1d35ad8fe857f257;hp=3ca490602055d18ef83cef933ea4605718e2c6c8;hpb=f0c501af5d99233efd3a45076ffbe69a71294863;p=builder.git

diff --git a/source/installedfile.cpp b/source/installedfile.cpp
index 3ca4906..f4b8a93 100644
--- a/source/installedfile.cpp
+++ b/source/installedfile.cpp
@@ -7,10 +7,10 @@ using namespace std;
 using namespace Msp;
 
 InstalledFile::InstalledFile(Builder &b, const SourcePackage &p, FileTarget &s, const string &loc):
-	FileTarget(b, &p, generate_target_path(b.get_prefix(), s, loc)),
+	FileTarget(b, p, generate_target_path(b.get_prefix(), s, loc)),
 	source(s)
 {
-	add_depend(&source);
+	add_depend(source);
 
 	if(const SharedLibrary *shlib = dynamic_cast<const SharedLibrary *>(&source))
 		if(!shlib->get_soname().empty())
@@ -25,13 +25,20 @@ FS::Path InstalledFile::generate_target_path(const FS::Path &prefix, const FileT
 	if(!tgt.is_installable() && loc.empty())
 		throw invalid_argument(tgt.get_name()+" is not installable");
 
-	string mid;
+	FS::Path mid;
 	if(!loc.empty())
 		mid = loc;
+	else if(const Component *comp = tgt.get_component())
+		mid = comp->get_install_map().get_install_location(tgt);
 	else
 		mid = tgt.get_install_location();
 
-	return prefix/mid/FS::basename(tgt.get_path());
+	string fn = FS::basename(tgt.get_path());
+	if(const SharedLibrary *shlib = dynamic_cast<const SharedLibrary *>(&tgt))
+		if(!shlib->get_soname().empty())
+			fn = shlib->get_soname();
+
+	return prefix/mid/fn;
 }
 
 Target *InstalledFile::get_real_target()