X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Finstalledfile.cpp;h=15bd08b06f7b507b16109c8f08f7933306d1e092;hb=e89616b514c77e189b93d5a46aa5a5a72e34c3cb;hp=0928386c092c24f6dba4b7d1f0c7999d385c41c7;hpb=968db78efd29b1f4890068693728299b2c7c92c7;p=builder.git

diff --git a/source/installedfile.cpp b/source/installedfile.cpp
index 0928386..15bd08b 100644
--- a/source/installedfile.cpp
+++ b/source/installedfile.cpp
@@ -25,9 +25,11 @@ 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();