From: Marius Vlad <marius.vlad@collabora.com>
Date: Sat, 11 Mar 2023 17:02:26 +0000 (+0200)
Subject: meson.build: Remove any prefix assumptions
X-Git-Tag: 17.90.0~36
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?p=src%2Fagl-compositor.git;a=commitdiff_plain;h=1a359aa6e263f2476c6557ea7f19756ab318b35f

meson.build: Remove any prefix assumptions

This forces to create a include directory by hand, which we don't seem
to be needing. This only affected the cases where we build the
compositor locally, without yocto/OE.

Bug-AGL: SPEC-4725
Signed-off-by: Marius Vlad <marius.vlad@collabora.com>
Change-Id: Ic279714671809eae2362da9fccaf592f10f2b888
---

diff --git a/meson.build b/meson.build
index bdec8fd..463b0fe 100644
--- a/meson.build
+++ b/meson.build
@@ -133,21 +133,7 @@ foreach proto: protocols
     endforeach
 endforeach
 
-# 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')
-  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
-
 dir_data = join_paths(prefix_path, get_option('datadir'))
 dir_data_agl_compositor = join_paths('agl-compositor', 'protocols')
 dir_data_pc = join_paths(dir_data, 'pkgconfig')
@@ -157,7 +143,6 @@ deps_libweston = [
   dependency('wayland-server'),
   libweston_dep,
   dependency('libweston-desktop-10'),
-  local_dep,
 ]