Bugfixes

diff --git a/source/misc.cpp b/source/misc.cpp
index 4d2019a5fd28c2a1954884f8683fdb4a691b5292..cf180ce1beada0ab0a4ce2dc23e829fdd3d258a9 100644 (file)
--- 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 fd1c9758d8f498e04f227bd752cb80f866e4fd30..6183d20de19285900e11c177a2b804ecbd096f16 100644 (file)
--- 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 cadd1330e0bc94b2816e6b26268b5d0a195e5efb..a5cacce44e92b2df956c1f593bcab082aee8fba5 100644 (file)
--- 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);
        }