diff options
| author | Mike Gorse <mgorse@suse.com> | 2019-11-29 20:58:31 +0000 |
|---|---|---|
| committer | Mike Gorse <mgorse@suse.com> | 2019-11-29 20:58:31 +0000 |
| commit | 109280bd5d68c5de935839722b73e3cf23490c6a (patch) | |
| tree | cf4aec6efd88386b84c5ab1cc7fcdf5e524cc3ed | |
| parent | 65e967adb86bd5d6c91664f31bd12546c5a100aa (diff) | |
| parent | 1b56652932631c0513c3686f6cd1446bdb17193a (diff) | |
| download | at-spi2-core-109280bd5d68c5de935839722b73e3cf23490c6a.tar.gz | |
Merge branch 'master' into 'master'
Avoid depending on meson 0.50
Closes #20
See merge request GNOME/at-spi2-core!26
| -rw-r--r-- | bus/meson.build | 4 | ||||
| -rw-r--r-- | meson.build | 2 | ||||
| -rw-r--r-- | registryd/meson.build | 1 |
3 files changed, 1 insertions, 6 deletions
diff --git a/bus/meson.build b/bus/meson.build index 155dc533..0fff5a89 100644 --- a/bus/meson.build +++ b/bus/meson.build @@ -10,25 +10,21 @@ session_dir = join_paths(atspi_sysconfdir, 'xdg/autostart') configure_file(input: 'accessibility.conf.in', output: 'accessibility.conf', configuration: accessibility_conf, - install: true, install_dir: busconfig_dir) configure_file(input: 'at-spi-dbus-bus.desktop.in', output: 'at-spi-dbus-bus.desktop', configuration: libexec_conf, - install: true, install_dir: session_dir) configure_file(input: 'org.a11y.Bus.service.in', output: 'org.a11y.Bus.service', configuration: libexec_conf, - install: true, install_dir: dbus_services_dir) configure_file(input: 'at-spi-dbus-bus.service.in', output: 'at-spi-dbus-bus.service', configuration: libexec_conf, - install: true, install_dir: systemd_user_dir) launcher_args = [ diff --git a/meson.build b/meson.build index 0a2f75ed..643415e4 100644 --- a/meson.build +++ b/meson.build @@ -6,7 +6,7 @@ project('at-spi2-core', 'c', 'warning_level=1', 'c_std=c99', ], - meson_version: '>= 0.50.0') + meson_version: '>= 0.40.1') add_project_arguments([ '-D_POSIX_C_SOURCE=200809L', '-D_DEFAULT_SOURCE' ], language: 'c') diff --git a/registryd/meson.build b/registryd/meson.build index c2404d28..739509f4 100644 --- a/registryd/meson.build +++ b/registryd/meson.build @@ -41,5 +41,4 @@ libexec_conf.set('libexecdir', atspi_libexecdir) configure_file(input: 'org.a11y.atspi.Registry.service.in', output: 'org.a11y.atspi.Registry.service', configuration: libexec_conf, - install: true, install_dir: join_paths(atspi_datadir, 'dbus-1/accessibility-services')) |