X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=inline;f=source%2Finstalledfile.cpp;h=a71bcba3c29adae803f357c1455ad3dc76bae2d5;hb=6f76342d14c7b7ec7b9629fcfd40199bca1e5e0f;hp=3ca490602055d18ef83cef933ea4605718e2c6c8;hpb=f0c501af5d99233efd3a45076ffbe69a71294863;p=builder.git diff --git a/source/installedfile.cpp b/source/installedfile.cpp index 3ca4906..a71bcba 100644 --- a/source/installedfile.cpp +++ b/source/installedfile.cpp @@ -7,7 +7,7 @@ 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); @@ -25,7 +25,7 @@ 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