From: Mikko Rasa <tdb@tdb.fi>
Date: Sat, 21 Feb 2009 14:13:45 +0000 (+0000)
Subject: Bugfixes
X-Git-Tag: 1.0~18
X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=e33295642f19558bb43f66a1ef4779ef97979653;p=builder.git

Bugfixes
---

diff --git a/source/misc.cpp b/source/misc.cpp
index 4d2019a..cf180ce 100644
--- a/source/misc.cpp
+++ b/source/misc.cpp
@@ -59,6 +59,7 @@ string run_command(const StringList &argv)
 			else
 				result.append(buf, len);
 		}
+		close(pfd[0]);
 	}
 
 	return result;
diff --git a/source/objectfile.cpp b/source/objectfile.cpp
index fd1c975..6183d20 100644
--- a/source/objectfile.cpp
+++ b/source/objectfile.cpp
@@ -56,7 +56,7 @@ void ObjectFile::find_depends(Target *tgt)
 	if(!src)
 		return;
 
-	FS::Path spath=src->get_path();
+	FS::Path spath=FS::dirname(src->get_path());
 	const StringList &incpath=comp.get_build_info().incpath;
 
 	const list<string> &includes=src->get_includes();
diff --git a/source/sourcefile.cpp b/source/sourcefile.cpp
index cadd133..a5cacce 100644
--- a/source/sourcefile.cpp
+++ b/source/sourcefile.cpp
@@ -71,7 +71,7 @@ void SourceFile::find_depends()
 	FS::Path dir=FS::dirname(path);
 	for(list<string>::iterator i=includes.begin(); i!=includes.end(); ++i)
 	{
-		Target *hdr=builder.get_header(*i, path, incpath);
+		Target *hdr=builder.get_header(*i, dir, incpath);
 		if(hdr)
 			add_depend(hdr);
 	}