X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=inline;f=source%2Finstalledfile.cpp;h=f4b8a939832efc0aa150c5bc10196bba9c3f42c2;hb=a116ad9af4a6a75093f6e1c3603d16b397833154;hp=4ee821fab1ab55bc74a5075a378f2b926e89b990;hpb=d6e5645659cc31231e6da5028ddd0e0aeca19218;p=builder.git

diff --git a/source/installedfile.cpp b/source/installedfile.cpp
index 4ee821f..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())
@@ -20,6 +20,27 @@ InstalledFile::InstalledFile(Builder &b, const SourcePackage &p, FileTarget &s,
 		builder.get_vfs().register_path(link, this);
 }
 
+FS::Path InstalledFile::generate_target_path(const FS::Path &prefix, const FileTarget &tgt, const string &loc)
+{
+	if(!tgt.is_installable() && loc.empty())
+		throw invalid_argument(tgt.get_name()+" is not installable");
+
+	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();
+
+	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()
 {
 	return source.get_real_target();
@@ -34,17 +55,3 @@ void InstalledFile::check_rebuild()
 	else if(source.needs_rebuild())
 		mark_rebuild(source.get_name()+" needs rebuilding");
 }
-
-FS::Path InstalledFile::generate_target_path(const FS::Path &prefix, const FileTarget &tgt, const string &loc)
-{
-	if(!tgt.is_installable() && loc.empty())
-		throw invalid_argument(tgt.get_name()+" is not installable");
-
-	string mid;
-	if(!loc.empty())
-		mid = loc;
-	else
-		mid = tgt.get_install_location();
-
-	return prefix/mid/FS::basename(tgt.get_path());
-}