X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=meson.build;h=fab3d3557e783d968602c27f3b9de24dc9ca99f2;hb=5c28111899c499306ad1d63b1910f40690b02082;hp=caac91b31376fcc49e88aad8448e156c03db2086;hpb=6b15d7b6b6a78f467abe7244e6805389c7594114;p=platform%2Fupstream%2Fat-spi2-core.git

diff --git a/meson.build b/meson.build
index caac91b..fab3d35 100644
--- a/meson.build
+++ b/meson.build
@@ -23,9 +23,12 @@ at_spi_conf.set('GETTEXT_PACKAGE', meson.project_name())
 root_inc = include_directories('.')
 registryd_inc = include_directories('registryd')
 
-atspi_datadir = join_paths(get_option('prefix'), get_option('datadir'))
-atspi_libexecdir = join_paths(get_option('prefix'), get_option('libexecdir'))
-atspi_sysconfdir = join_paths(get_option('prefix'), get_option('sysconfdir'))
+atspi_prefix = get_option('prefix')
+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_includedir = join_paths(atspi_prefix, get_option('includedir'))
 
 if get_option('dbus_services_dir') != 'default'
   dbus_services_dir = get_option('dbus_services_dir')
@@ -106,8 +109,8 @@ configure_file(output: 'config.h', configuration: at_spi_conf)
 pkgconf = configuration_data()
 pkgconf.set('prefix', get_option('prefix'))
 pkgconf.set('exec_prefix', get_option('prefix'))
-pkgconf.set('libdir', get_option('libdir'))
-pkgconf.set('includedir', get_option('includedir'))
+pkgconf.set('libdir', atspi_libdir)
+pkgconf.set('includedir', atspi_includedir)
 pkgconf.set('VERSION', meson.project_version())
 
 configure_file(input: 'atspi-2.pc.in',