Make install_location a path

[builder.git] / source / csourcefile.cpp

diff --git a/source/csourcefile.cpp b/source/csourcefile.cpp
index 0ff4286c5cb87bb6270a5978c304c8969c29bed0..3c3aad935f965e7c039ad68bbe3d7419afb832f6 100644 (file)
--- a/source/csourcefile.cpp
+++ b/source/csourcefile.cpp
@@ -11,23 +11,23 @@ using namespace std;
 using namespace Msp;
 
 CSourceFile::CSourceFile(Builder &b, const FS::Path &p):
-       SourceFile(b, 0, p)
+       SourceFile(b, p)
 { }
 
 CSourceFile::CSourceFile(Builder &b, const Component &c, const FS::Path &p):
-       SourceFile(b, &c, p)
+       SourceFile(b, c, p)
 {
        string ext = FS::extpart(FS::basename(path));
        if(ext==".h" || ext==".H" || ext==".hpp")
-               install_location = "include/"+comp->get_name();
+               install_location = FS::Path("include")/component->get_name();
 }
 
 void CSourceFile::find_depends()
 {
-       if(!comp || !mtime)
+       if(!component || !mtime)
                return;
 
-       const SourcePackage &spkg = comp->get_package();
+       const SourcePackage &spkg = component->get_package();
        string relname = FS::relative(path, spkg.get_source()).str();
 
        DependencyCache &deps_cache = spkg.get_deps_cache();
@@ -49,7 +49,7 @@ void CSourceFile::find_depends()
                deps_cache.set_deps(relname, includes);
        }
 
-       const BuildInfo::PathList &incpath = comp->get_build_info().incpath;
+       const BuildInfo::PathList &incpath = component->get_build_info().incpath;
        BuildInfo::PathList local_incpath = incpath;
        local_incpath.push_front(FS::dirname(path).str());