meson: Build fixes

snyball · Aug 12, 2019 · c78e43b · c78e43b
1 parent aab56e8
commit c78e43b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/hawck-ui/meson.build b/hawck-ui/meson.build
@@ -15,4 +15,6 @@ run_target('hawck-ui',
   command : [python3.find_python(), 'setup.py', 'build'],
 )
 
-meson.add_install_script('install-hawck-ui.sh')
+if get_option('use_meson_install')
+  meson.add_install_script('install-hawck-ui.sh')
+endif
diff --git a/hawck-ui/setup.py b/hawck-ui/setup.py
@@ -1,11 +1,13 @@
 #!/usr/bin/python3
 
-import setuptools, json
+import os, setuptools, json
 
 with open("README.md", "r") as fh:
     long_description = fh.read()
 
-with open("../build/hawck-ui/setup_config.json") as rf:
+MESON_BUILD_ROOT = os.environ.get('MESON_BUILD_ROOT') or '../build'
+
+with open(os.path.join(MESON_BUILD_ROOT, "hawck-ui/setup_config.json")) as rf:
     config = json.load(rf)
 
 setuptools.setup(