X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fsourcepackage.cpp;h=cfe4be3f31a781ea1a5217eaaaf45ba6ec6d49f1;hb=4d0d003b022943d8a0e39ba19078bab8d32d8857;hp=caedaf673c2d5a9ef6bc8b305f896bbb85da0d0d;hpb=0ac8d6708b8c758fb89d97a0049d4a329990b83b;p=builder.git diff --git a/source/sourcepackage.cpp b/source/sourcepackage.cpp index caedaf6..cfe4be3 100644 --- a/source/sourcepackage.cpp +++ b/source/sourcepackage.cpp @@ -19,7 +19,7 @@ using namespace Msp; /** Creates a buildable package. */ -SourcePackage::SourcePackage(Builder &b, const string &n, const Path::Path &s): +SourcePackage::SourcePackage(Builder &b, const string &n, const Path &s): Package(b, n), source(s), config(*this), @@ -28,12 +28,12 @@ SourcePackage::SourcePackage(Builder &b, const string &n, const Path::Path &s): tar_files.push_back(source/"Build"); } -Msp::Path::Path SourcePackage::get_temp_dir() const +Msp::Path SourcePackage::get_temp_dir() const { return source/config.get_option("tempdir").value/config.get_option("profile").value; } -Msp::Path::Path SourcePackage::get_out_dir() const +Msp::Path SourcePackage::get_out_dir() const { return source/config.get_option("outdir").value; } @@ -194,9 +194,9 @@ void SourcePackage::create_build_info() unsigned flags=get_install_flags(); if(flags&INCLUDE) - export_binfo.incpath.push_back((Path::Path(config.get_option("prefix").value)/"include").str()); + export_binfo.incpath.push_back((Path(config.get_option("prefix").value)/"include").str()); if(flags&LIB) - export_binfo.libpath.push_back((Path::Path(config.get_option("prefix").value)/"lib").str()); + export_binfo.libpath.push_back((Path(config.get_option("prefix").value)/"lib").str()); string optimize=config.get_option("optimize").value; if(lexical_cast(optimize))