X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcsourcefile.cpp;h=b0346e46cd01d94dc5d57ef01daf2823f8bb37cb;hb=4699c9eb82fb55268976fda87f1f4bf5f7df95a4;hp=7a26bb5ff4c503b0072eb9ed5bde9e3e25d15bdb;hpb=2aaad259f2dff58c1e909f1e6d83961e78fd7d3e;p=builder.git

diff --git a/source/csourcefile.cpp b/source/csourcefile.cpp
index 7a26bb5..b0346e4 100644
--- a/source/csourcefile.cpp
+++ b/source/csourcefile.cpp
@@ -11,15 +11,15 @@ 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/"+component->get_name();
+		install_location = FS::Path("include")/package->get_name();
 }
 
 void CSourceFile::find_depends()
@@ -57,6 +57,6 @@ void CSourceFile::find_depends()
 	{
 		Target *hdr = builder.get_vfs().find_header(i->substr(1), ((*i)[0]=='"' ? local_incpath : incpath));
 		if(hdr)
-			add_depend(hdr);
+			add_depend(*hdr);
 	}
 }