From: John Marshall <jtm.home@gmail.com>
Date: Wed, 27 May 2020 11:20:10 +0000 (+0100)
Subject: build: add build path variables
X-Git-Tag: archive/raspbian/1%0.1.106-3+rpi1^2~15^2~8^2~17
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=de4587169edaa7c693f46a799d11cfa4a0d63806;p=babl.git

build: add build path variables
  - add build path variables for library and extensions
---

diff --git a/babl/meson.build b/babl/meson.build
index 6feb107..37d2e4d 100644
--- a/babl/meson.build
+++ b/babl/meson.build
@@ -1,3 +1,5 @@
+babl_library_build_dir = meson.current_build_dir()
+
 bablInclude = include_directories('.')
 subdir('base')
 
diff --git a/docs/meson.build b/docs/meson.build
index 74984b0..4a771b5 100644
--- a/docs/meson.build
+++ b/docs/meson.build
@@ -23,14 +23,14 @@ babl_css = configure_file(
 )
 
 index_html_tmp_env = [
-  'BABL_PATH=' + meson.build_root() / 'extensions',
+  'BABL_PATH=' + babl_extensions_build_dir,
 ]
 
 # Don't build babl ref if cannot run compiled objects in this env
-if env_bin.found() and cc_can_run # and not meson.is_cross_build()
+if env_bin.found() and cc_can_run
   index_html_tmp = custom_target('index.html.tmp',
-    input : [ babl_html_dump, ],
-    output: [ 'index.html.tmp', ],
+    input : babl_html_dump,
+    output:'index.html.tmp',
     command: [
       env_bin,
       index_html_tmp_env,
diff --git a/extensions/meson.build b/extensions/meson.build
index acfbbcb..8d96066 100644
--- a/extensions/meson.build
+++ b/extensions/meson.build
@@ -1,3 +1,5 @@
+babl_extensions_build_dir = meson.current_build_dir()
+
 no_cflags = []
 
 # Dependencies
diff --git a/tests/meson.build b/tests/meson.build
index 4431ed8..8be32f7 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -34,9 +34,9 @@ if platform_unix
 endif
 
 test_env = environment()
-test_env.prepend('LD_LIBRARY_PATH', join_paths(meson.build_root(), 'babl'))
-test_env.set('GI_TYPELIB_PATH', join_paths(meson.build_root(), 'babl'))
-test_env.set('BABL_PATH', join_paths(meson.build_root(), 'extensions'))
+test_env.prepend('LD_LIBRARY_PATH', babl_library_build_dir)
+test_env.set('GI_TYPELIB_PATH', babl_library_build_dir)
+test_env.set('BABL_PATH', babl_extensions_build_dir)
 foreach test_name : test_names
   test = executable(
     test_name,