Merge "at_spi2_tool is now in path'ed directory" into tizen

diff --git a/meson.build b/meson.build
index 7eaa416..e86454d 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -28,6 +28,7 @@ atspi_datadir = join_paths(atspi_prefix, get_option('datadir'))
 atspi_libexecdir = join_paths(atspi_prefix, get_option('libexecdir'))
 atspi_sysconfdir = join_paths(atspi_prefix, get_option('sysconfdir'))
 atspi_libdir = join_paths(atspi_prefix, get_option('libdir'))
+atspi_bindir = join_paths(atspi_prefix, get_option('bindir'))
 atspi_includedir = join_paths(atspi_prefix, get_option('includedir'))
 
 if get_option('dbus_services_dir') != 'default'

diff --git a/packaging/at-spi2-core.spec b/packaging/at-spi2-core.spec
index e6ba0f1..fc2c7bc 100644 (file)
--- a/packaging/at-spi2-core.spec
+++ b/packaging/at-spi2-core.spec
@@ -101,7 +101,7 @@ rm -fr %{buildroot}
 %files -f %{name}.lang
 %manifest %{name}.manifest
 %defattr(-,root,root)
-%{_libexecdir}/at_spi2_tool
+%{_bindir}/at_spi2_tool
 
 %doc AUTHORS README
 %license COPYING

diff --git a/test/meson.build b/test/meson.build
index e564e2a..3f469c0 100644 (file)
--- a/test/meson.build
+++ b/test/meson.build
@@ -12,5 +12,5 @@ executable('at_spi2_tool', at_spi2_tool_sources,
            c_args: '-fPIE',
            link_args: '-pie',
            install: true,
-           install_dir: atspi_libexecdir)
+           install_dir: atspi_bindir)