[glib/meson-for-merge] meson: fix wrong #include's for gdbus_codegen files

[Matthias Clasen <matthiasc src gnome org>]

commit 266bc1e510e154f7b5e793adb227d979ae655446
Author: Alessandro Decina <alessandro d gmail com>
Date:   Wed Jul 12 16:15:38 2017 +1000

    meson: fix wrong #include's for gdbus_codegen files
    
    When building glib as a subproject, #include's for xdp-dbus.h from xdp-dbus.c
    and for gdbus-daemon-generated.h from gdbus-daemon-generated.c were generated as
    being prefixed with the subproject prefix, eg
     #include "subproject/glib/gio/gdbus-daemon-generated.h".
    That failed since the root of the build directory is obviously not part of the
    include path when building a subproject.
    
    Passing --output-directory @OUTDIR@ to gdbus-codegen and removing @OUTDIR@ from
    --generate-c-code fixes the issue.

 gio/meson.build |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/gio/meson.build b/gio/meson.build
index 31153bb..1fb3a53 100644
--- a/gio/meson.build
+++ b/gio/meson.build
@@ -175,7 +175,8 @@ xdp_dbus_generated = custom_target('xdp-dbus',
     output : ['xdp-dbus.h', 'xdp-dbus.c'],
     command : [python, gdbus_codegen,
                '--interface-prefix', 'org.freedesktop.portal.',
-               '--generate-c-code', '@OUTDIR@/xdp-dbus',
+               '--output-directory', '@OUTDIR@',
+               '--generate-c-code', 'xdp-dbus',
                '--c-namespace', 'GXdp',
                '--annotate', 'org.freedesktop.portal.Documents.Add()',
                              'org.gtk.GDBus.C.UnixFD', 'true',
@@ -189,7 +190,8 @@ gdbus_daemon_generated = custom_target('gdbus-daemon-generated',
     output : ['gdbus-daemon-generated.h', 'gdbus-daemon-generated.c'],
     command : [python, gdbus_codegen,
                '--interface-prefix', 'org.',
-               '--generate-c-code', '@OUTDIR@/gdbus-daemon-generated',
+               '--output-directory', '@OUTDIR@',
+               '--generate-c-code', 'gdbus-daemon-generated',
                '--c-namespace', '_G', '@INPUT@'])
 
 settings_headers = files([