From: Evan Nemerson Date: Tue, 4 May 2010 20:51:37 +0000 (+0200) Subject: doclet/gtkdoc: fix failure to build outside of the source directory X-Git-Tag: 0.37.1~3^2~464 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ff3d63d5a37be4628745d3ddca23e3c54f7d5f88;p=thirdparty%2Fvala.git doclet/gtkdoc: fix failure to build outside of the source directory --- diff --git a/src/doclets/gtkdoc/doclet.vala b/src/doclets/gtkdoc/doclet.vala index f67b9a979..d2e6e2a95 100644 --- a/src/doclets/gtkdoc/doclet.vala +++ b/src/doclets/gtkdoc/doclet.vala @@ -129,8 +129,9 @@ public class Gtkdoc.Director : Valadoc.Doclet, Object { vala_headers = new string[]{}; c_headers = new string[]{}; Dir dir; + string dirname = settings.basedir ?? "."; try { - dir = Dir.open (settings.basedir ?? "."); + dir = Dir.open (dirname); } catch (Error e) { warning ("GtkDoc: Can't open %s: %s", settings.basedir, e.message); return; @@ -140,7 +141,7 @@ public class Gtkdoc.Director : Valadoc.Doclet, Object { while ((filename = dir.read_name()) != null) { if (filename.has_suffix (".h")) { - var stream = FileStream.open (filename, "r"); + var stream = FileStream.open (Path.build_filename (dirname, filename), "r"); if (stream != null) { var line = stream.read_line (); if (line != null) {