From: Rico Tzschichholz <ricotz@ubuntu.com>
Date: Thu, 8 Feb 2018 15:14:42 +0000 (+0100)
Subject: compiler: Prefix headers for set_cheader_override() if includedir is given
X-Git-Tag: 0.38.8~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=32f1b03edb0b2a5cf4aa471b2aad9ef238a8e1b1;p=thirdparty%2Fvala.git

compiler: Prefix headers for set_cheader_override() if includedir is given

We need to account for changes done by SourceFile.get_cinclude_filename()

https://bugzilla.gnome.org/show_bug.cgi?id=793299
---

diff --git a/compiler/valacompiler.vala b/compiler/valacompiler.vala
index 1260135b8..add033b0a 100644
--- a/compiler/valacompiler.vala
+++ b/compiler/valacompiler.vala
@@ -464,7 +464,15 @@ class Vala.Compiler {
 			}
 
 			var interface_writer = new CodeWriter (CodeWriterType.INTERNAL);
-			interface_writer.set_cheader_override(header_filename, internal_header_filename);
+
+			if (context.includedir != null) {
+				var prefixed_header_filename = Path.build_path ("/", context.includedir, Path.get_basename (header_filename));
+				var prefixed_internal_header_filename = Path.build_path ("/", context.includedir, Path.get_basename (internal_header_filename));
+				interface_writer.set_cheader_override (prefixed_header_filename, prefixed_internal_header_filename);
+			} else {
+				interface_writer.set_cheader_override (header_filename, internal_header_filename);
+			}
+
 			string vapi_filename = internal_vapi_filename;
 
 			// put .vapi file in current directory unless -d has been explicitly specified