X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Finstall.cpp;h=6dcaef0ca9da3c3656ad85723d447438daffcff4;hb=0f5283a54fd188072eca23fbd980a43c6c869913;hp=e9be68298ee1dddda2ad6c5fd6577e730ddeb144;hpb=7aeaa4ba965f596edad438c02e345a8843f7469a;p=builder.git diff --git a/source/install.cpp b/source/install.cpp index e9be682..6dcaef0 100644 --- a/source/install.cpp +++ b/source/install.cpp @@ -18,7 +18,7 @@ Distributed under the LGPL using namespace std; using namespace Msp; -Install::Install(Builder &b, const Package &p, Target &tgt): +Install::Install(Builder &b, const SourcePackage &p, Target &tgt): Target(b, &p, generate_target_name(tgt)) { buildable=true; @@ -33,9 +33,9 @@ void Install::check_rebuild() { Target *dep=depends.front(); if(dep->get_mtime()>mtime) - mark_rebuild(Path::basename(dep->get_name())+" has changed"); + mark_rebuild(basename(dep->get_name())+" has changed"); else if(dep->get_rebuild()) - mark_rebuild(Path::basename(dep->get_name())+" needs rebuilding"); + mark_rebuild(basename(dep->get_name())+" needs rebuilding"); } } @@ -46,7 +46,9 @@ Action *Install::build() string Install::generate_target_name(const Target &tgt) { - Path::Path base=tgt.get_package()->get_prefix(); + const SourcePackage *spkg=dynamic_cast(tgt.get_package()); + + Path base=spkg->get_builder().get_prefix(); string tgtname=tgt.get_name().substr(tgt.get_name().rfind('/')+1); string mid;