Rearrange Target members

[builder.git] / source / installedfile.cpp

diff --git a/source/installedfile.cpp b/source/installedfile.cpp
index 3ca490602055d18ef83cef933ea4605718e2c6c8..09cfed6db03a47165b3cb7c1834e2758244cc803 100644 (file)
--- 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,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();