X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Finstalledfile.cpp;h=15bd08b06f7b507b16109c8f08f7933306d1e092;hb=75ac80cb255e4def7ee685ce9c46db7c2f6625aa;hp=04a40ece30fc3714309d27a3f150f1eae23b3f44;hpb=1a8a5197f67a420c496a3a61daa3528deab4d224;p=builder.git

diff --git a/source/installedfile.cpp b/source/installedfile.cpp
index 04a40ec..15bd08b 100644
--- a/source/installedfile.cpp
+++ b/source/installedfile.cpp
@@ -6,8 +6,8 @@
 using namespace std;
 using namespace Msp;
 
-InstalledFile::InstalledFile(Builder &b, const SourcePackage &p, FileTarget &s, const std::string &loc):
-	FileTarget(b, &p, generate_target_path(b.get_prefix(), s, loc)),
+InstalledFile::InstalledFile(Builder &b, const SourcePackage &p, FileTarget &s, const string &loc):
+	FileTarget(b, p, generate_target_path(b.get_prefix(), s, loc)),
 	source(s)
 {
 	add_depend(&source);
@@ -20,6 +20,22 @@ 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();
+
+	return prefix/mid/FS::basename(tgt.get_path());
+}
+
 Target *InstalledFile::get_real_target()
 {
 	return source.get_real_target();
@@ -34,17 +50,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 std::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());
-}