| Brad Bishop | c342db3 | 2019-05-15 21:57:59 -0400 | [diff] [blame] | 1 | From 44a812ea51223d82f21a098a2d45fcc5c329ce7a Mon Sep 17 00:00:00 2001 |
| 2 | From: Tobias Stoeckmann <tobias@stoeckmann.org> |
| 3 | Date: Tue, 12 Mar 2019 11:46:24 +0100 |
| 4 | Subject: [PATCH] Fix meson.build for meson 0.50.0. |
| 5 | |
| 6 | Since meson 0.50.0 it is not possible anymore to specify an |
| 7 | absolute directory for subdir. To keep current functionality, |
| 8 | use install_dir instead. |
| 9 | |
| 10 | atspi/meson.build:60:0: ERROR: Subdir keyword must not be an absolute path. |
| 11 | |
| 12 | Upstream-Status: Backport |
| 13 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
| 14 | Signed-off-by: Tobias Stoeckmann <tobias@stoeckmann.org> |
| 15 | --- |
| 16 | atspi/meson.build | 2 +- |
| 17 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 18 | |
| 19 | diff --git a/atspi/meson.build b/atspi/meson.build |
| 20 | index b7a9357..2a6915d 100644 |
| 21 | --- a/atspi/meson.build |
| 22 | +++ b/atspi/meson.build |
| 23 | @@ -57,7 +57,7 @@ atspi_headers = [ |
| 24 | |
| 25 | atspi_includedir = join_paths(get_option('prefix'), get_option('includedir'), 'at-spi-2.0', 'atspi') |
| 26 | |
| 27 | -install_headers(atspi_headers, subdir: atspi_includedir) |
| 28 | +install_headers(atspi_headers, install_dir: atspi_includedir) |
| 29 | |
| 30 | atspi_enums = gnome.mkenums('atspi-enum-types', |
| 31 | sources: [ 'atspi-constants.h', 'atspi-types.h' ], |