X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fsourcefile.cpp;h=0fc989d0f5a78927acce28f38050c0feddc7f09d;hb=409a427f912f9c203b102beed0816b53b250931f;hp=3a1941af4b76b8ea41266ef6d237bdf846e10962;hpb=04c316da6d5d90e43cba262f54d90ca231f703bf;p=builder.git

diff --git a/source/sourcefile.cpp b/source/sourcefile.cpp
index 3a1941a..0fc989d 100644
--- a/source/sourcefile.cpp
+++ b/source/sourcefile.cpp
@@ -36,7 +36,7 @@ void SourceFile::find_depends()
 	}
 
 	const SourcePackage &spkg = comp->get_package();
-	string relname = FS::relative(name, spkg.get_source()).str();
+	string relname = FS::relative(path, spkg.get_source()).str();
 	DependencyCache &deps_cache = spkg.get_deps_cache();
 	bool deps_found = false;
 	if(mtime<deps_cache.get_mtime())
@@ -54,10 +54,10 @@ void SourceFile::find_depends()
 	{
 		try
 		{
-			IO::BufferedFile in(name);
+			IO::BufferedFile in(path.str());
 
 			if(builder.get_verbose()>=4)
-				IO::print("Reading includes from %s\n", name);
+				IO::print("Reading includes from %s\n", path.str());
 
 			Regex r_include("^[ \t]*#include[ \t]+([\"<].*)[\">]");
 
@@ -68,9 +68,11 @@ void SourceFile::find_depends()
 
 			deps_cache.set_deps(relname, includes);
 		}
-		catch(const IO::FileNotFound &)
+		catch(const IO::file_not_found &)
 		{
-			// XXX WTF?
+			if(builder.get_verbose()>=4)
+				IO::print("Failed to read includes from %s\n", path.str());
+			deps_ready = true;
 			return;
 		}
 	}