[gnome-software] external-appstream: Fix build

[Joaquim Manuel Pereira Rocha <jrocha src gnome org>]

commit d547412432e700f9e57001d5d6a51d5393426c97
Author: Joaquim Rocha <jrocha endlessm com>
Date:   Tue Sep 12 20:35:18 2017 +0200

    external-appstream: Fix build
    
    Meson was not well configured for this plugin and thus building it was
    failing.

 data/meson.build                       |    5 ++++-
 plugins/external-appstream/meson.build |    7 ++++---
 2 files changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/data/meson.build b/data/meson.build
index 8c94c8f..4be6a3d 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -8,11 +8,14 @@ install_data('org.gnome.software.gschema.xml',
 
 if get_option('enable-external-appstream')
   # replace @libexecdir@
+  conf_data = configuration_data()
+  conf_data.set('libexecdir', join_paths(get_option('prefix'),
+                                         get_option('libexecdir')))
   configure_file(
     input : 'org.gnome.software.external-appstream.policy.in',
     output : 'org.gnome.software.external-appstream.policy',
     install: true,
     install_dir: join_paths(get_option('datadir'), 'polkit-1', 'actions'),
-    configuration : conf
+    configuration : conf_data
   )
 endif
diff --git a/plugins/external-appstream/meson.build b/plugins/external-appstream/meson.build
index 183e2d9..6bc4510 100644
--- a/plugins/external-appstream/meson.build
+++ b/plugins/external-appstream/meson.build
@@ -4,9 +4,9 @@ executable(
   'gnome-software-install-appstream',
   sources : 'gs-install-appstream.c',
   include_directories : [
-    include_directories('@0@/..'.format(meson.current_build_dir())),
+    include_directories('../..'),
   ],
-  dependencies : [appstream_glib],
+  dependencies : [gio_unix, appstream_glib],
   c_args : cargs,
   install : true,
   install_dir : 'libexec'
@@ -17,9 +17,10 @@ shared_module(
 sources : 'gs-plugin-external-appstream.c',
   include_directories : [
     include_directories('../..'),
+    include_directories('../../lib'),
   ],
   install : true,
   install_dir: plugin_dir,
   c_args : cargs,
-  dependencies : [gio_unix, appstream_glib, libsoup]
+  dependencies : [gio_unix, appstream_glib, libsoup, plugin_libs]
 )