Simplify InstalledFile::generate_target_path

diff --git a/source/installedfile.cpp b/source/installedfile.cpp
index 1750a15df6e97bcfc02a94da004666144d990644..a9c34733837ac2e4902b5cdb15146d10ae9c6af7 100644 (file)
--- a/source/installedfile.cpp
+++ b/source/installedfile.cpp
@@ -14,7 +14,7 @@ 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(s, loc)),
+       FileTarget(b, &p, generate_target_path(b.get_prefix(), s, loc)),
        source(s)
 {
        buildable = true;
@@ -43,13 +43,10 @@ void InstalledFile::check_rebuild()
                mark_rebuild(source.get_name()+" needs rebuilding");
 }
 
-FS::Path InstalledFile::generate_target_path(const FileTarget &tgt, const std::string &loc)
+FS::Path InstalledFile::generate_target_path(const FS::Path &prefix, const FileTarget &tgt, const std::string &loc)
 {
-       if(!tgt.get_package())
-               throw invalid_argument("Can't install package-less targets");
-
-       FS::Path base = tgt.get_package()->get_builder().get_prefix();
-       string tgtname = FS::basename(tgt.get_path());
+       if(!tgt.is_installable() && loc.empty())
+               throw invalid_argument(tgt.get_name()+" is not installable");
 
        string mid;
        if(!loc.empty())
@@ -57,8 +54,5 @@ FS::Path InstalledFile::generate_target_path(const FileTarget &tgt, const std::s
        else
                mid = tgt.get_install_location();
 
-       if(mid.empty())
-               throw invalid_argument("Don't know where to install "+tgtname);
-
-       return base/mid/tgtname;
+       return prefix/mid/FS::basename(tgt.get_path());
 }

diff --git a/source/installedfile.h b/source/installedfile.h
index 6c6a933d5767ba33bc4c2f0e75e9ffebfd01f144..ef76ae7f60e8ca79b204c7e10122a4c46ec09bb5 100644 (file)
--- a/source/installedfile.h
+++ b/source/installedfile.h
@@ -22,7 +22,7 @@ public:
 private:
        virtual void check_rebuild();
 
-       static Msp::FS::Path generate_target_path(const FileTarget &i, const std::string &);
+       static Msp::FS::Path generate_target_path(const Msp::FS::Path &, const FileTarget &i, const std::string &);
 };
 
 #endif