Fix Meson install of include files. meson

Fri, 16 Jun 2017 20:02:45 -0400

author
Elliott Sales de Andrade <qulogic@pidgin.im>
date
Fri, 16 Jun 2017 20:02:45 -0400
branch
meson
changeset 38511
cddada195a91
parent 38510
863a17674290
child 38512
a8ee459a518c

Fix Meson install of include files.

Add dbus-types.h to install and use only source basename in enums
template. Using the basename makes no difference for autotools, which
is run in the source directory, but it does for Meson.

libpurple/enums.h.in file | annotate | diff | comparison | revisions
libpurple/meson.build file | annotate | diff | comparison | revisions
--- a/libpurple/enums.h.in	Fri Jun 16 05:18:15 2017 -0400
+++ b/libpurple/enums.h.in	Fri Jun 16 20:02:45 2017 -0400
@@ -38,7 +38,7 @@
 
 /*** BEGIN file-production ***/
 
-/* enumerations from "@filename@" */
+/* enumerations from "@basename@" */
 /*** END file-production ***/
 /*** BEGIN value-header ***/
 GType @enum_name@_get_type(void) G_GNUC_CONST;
--- a/libpurple/meson.build	Fri Jun 16 05:18:15 2017 -0400
+++ b/libpurple/meson.build	Fri Jun 16 20:02:45 2017 -0400
@@ -336,7 +336,9 @@
                              input : purple_build_coreheaders,
                              output : 'dbus-types.h',
                              command : [python, dbus_analyze_types, '-o', '@OUTPUT@',
-                                        '--pattern=PURPLE_DBUS_DECLARE_TYPE(%s)', '@INPUT@'])
+                                        '--pattern=PURPLE_DBUS_DECLARE_TYPE(%s)', '@INPUT@'],
+                             install : true,
+                             install_dir : join_paths(get_option('includedir'), 'libpurple'))
 
 dbus_bindings_c = custom_target('dbus_bindings_c',
                                 input : dbus_exported,

mercurial