From e33295642f19558bb43f66a1ef4779ef97979653 Mon Sep 17 00:00:00 2001 From: Mikko Rasa Date: Sat, 21 Feb 2009 14:13:45 +0000 Subject: [PATCH] Bugfixes --- source/misc.cpp | 1 + source/objectfile.cpp | 2 +- source/sourcefile.cpp | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) 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 &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::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); } -- 2.45.2