[gupnp/gupnp-1.4] meson: Respect bindir option
- From: Jens Georg <jensgeorg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gupnp/gupnp-1.4] meson: Respect bindir option
- Date: Mon, 11 Apr 2022 18:39:13 +0000 (UTC)
commit 13607fe3a88b8d6ac683378fc155d7f2f87b2dc7
Author: Marvin Schmidt <marv exherbo org>
Date: Mon Apr 11 19:51:42 2022 +0200
meson: Respect bindir option
Don't hardcode 'bin' (<prefix>/bin) but instead use the designated
bindir option to get the install location for the binding tool
meson.build | 3 +++
tools/meson.build | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/meson.build b/meson.build
index 94cd867..a3acea5 100644
--- a/meson.build
+++ b/meson.build
@@ -4,6 +4,9 @@ pkg = import('pkgconfig')
cc = meson.get_compiler('c')
+prefix = get_option('prefix')
+bindir = join_paths(prefix, get_option('bindir'))
+
netlink_available = cc.has_header('linux/rtnetlink.h')
ifaddrs_available = cc.has_header('ifaddrs.h')
diff --git a/tools/meson.build b/tools/meson.build
index 42fe7e4..ba9918c 100644
--- a/tools/meson.build
+++ b/tools/meson.build
@@ -1 +1 @@
-install_data('gupnp-binding-tool-1.2', install_dir : 'bin')
+install_data('gupnp-binding-tool-1.2', install_dir : bindir)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]