[vala/0.36: 173/212] compiler: Prefix headers for set_cheader_override() if includedir is given

[Rico Tzschichholz <ricotz src gnome org>]

commit 2da520fb35478348950d9a7f55893497948aa34c
Author: Rico Tzschichholz <ricotz ubuntu com>
Date:   Thu Feb 8 16:14:42 2018 +0100

    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

 compiler/valacompiler.vala |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)
---
diff --git a/compiler/valacompiler.vala b/compiler/valacompiler.vala
index 38d2422..1b8315c 100644
--- a/compiler/valacompiler.vala
+++ b/compiler/valacompiler.vala
@@ -447,7 +447,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