X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=meson.build;h=f8e97a566c43c6c4308da38fdfca8d839d51fc94;hb=d6f64b665a39e0bde2fe5d5b79a0274f734b2c6e;hp=27fb2d03765a28e9b03789e3ff2e2cb27fd114b0;hpb=0bef8700f21b9e7898f1785ee654d4669d0117b4;p=src%2Fagl-compositor.git

diff --git a/meson.build b/meson.build
index 27fb2d0..f8e97a5 100644
--- a/meson.build
+++ b/meson.build
@@ -13,6 +13,7 @@ config_h = configuration_data()
 agl_compositor_version = '0.0.19'
 libweston_version = 'libweston-8'
 pkgconfig = import('pkgconfig')
+fs = import('fs')
 
 cc = meson.get_compiler('c')
 cxx = meson.get_compiler('cpp')
@@ -134,14 +135,17 @@ foreach proto: protocols
     endforeach
 endforeach
 
-# libweston-6 pkg-config file already has 'libweston-6' as prefix but
-# agl-compositor uses 'libweston-6' also. This makes use of the prefix
-# path as to allow building and installing the compositor locally
+# libweston pkg-config file already has 'libweston' as prefix but
+# agl-compositor uses 'libweston' also. This makes use of the prefix path as to
+# allow building and installing the compositor locally
 prefix_path = get_option('prefix')
 message('prefix_path ' + prefix_path)
 if not prefix_path.contains('/usr')
-  additional_include_dir = include_directories(prefix_path + '/' + 'include')
-  local_dep = declare_dependency(include_directories: additional_include_dir)
+  include_dir_str = join_paths(prefix_path, 'include')
+  if not fs.is_dir(include_dir_str)
+    error('Prefix path does not contain an include directory!')
+  endif
+  local_dep = declare_dependency(include_directories: include_dir_str)
 else
   local_dep = []
 endif
@@ -237,11 +241,13 @@ if dep_libsmack.found()
   deps_libweston += dep_libsmack
 endif
 
+dir_module_agl_compositor = join_paths(join_paths(prefix_path, get_option('libdir')), 'agl-compositor')
 
 libexec_compositor = shared_library(
         'exec_compositor',
         sources: srcs_agl_compositor,
         dependencies: deps_libweston,
+        install_dir: dir_module_agl_compositor,
         install: true,
         version: '0.0.0',
         soversion: 0
@@ -259,6 +265,7 @@ exe_agl_compositor = executable(
 	'agl-compositor',
 	'src/main.c',
 	dependencies: dep_libexec_compositor,
+	install_rpath: dir_module_agl_compositor,
 	install: true
 )