[rhythmbox/wip/davidk/install-rpath] build: Do not set install_rpath
- From: David King <davidk src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [rhythmbox/wip/davidk/install-rpath] build: Do not set install_rpath
- Date: Mon, 2 May 2022 21:49:36 +0000 (UTC)
commit 02f9c4e724f948f61c70477a983b1bde0a321f03
Author: David King <amigadave amigadave com>
Date: Mon May 2 09:52:05 2022 +0100
build: Do not set install_rpath
The standard rpath should not be set forcibly.
meson.build | 2 --
metadata/meson.build | 3 +--
remote/dbus/meson.build | 3 +--
shell/meson.build | 3 +--
4 files changed, 3 insertions(+), 8 deletions(-)
---
diff --git a/meson.build b/meson.build
index 0a40c47c9..12676211c 100644
--- a/meson.build
+++ b/meson.build
@@ -300,8 +300,6 @@ sourcesinc = include_directories('sources')
sourcessyncinc = include_directories('sources/sync')
widgetsinc = include_directories('widgets')
-rpath = '@0@/@1@'.format(get_option('prefix'), get_option('libdir'))
-
subdir('data')
subdir('lib')
diff --git a/metadata/meson.build b/metadata/meson.build
index fbbe68e90..088660579 100644
--- a/metadata/meson.build
+++ b/metadata/meson.build
@@ -59,8 +59,7 @@ executable('rhythmbox-metadata', metadata_service_sources,
link_with: rbmetadata_lib,
dependencies: [librb_dep, rbmetadata_dep],
install: true,
- install_dir: get_option('libexecdir'),
- install_rpath: rpath
+ install_dir: get_option('libexecdir')
)
# test program
diff --git a/remote/dbus/meson.build b/remote/dbus/meson.build
index 0f053a2b6..fee785dd9 100644
--- a/remote/dbus/meson.build
+++ b/remote/dbus/meson.build
@@ -10,6 +10,5 @@ executable('rhythmbox-client',
'rb-client.c',
c_args: client_c_args,
dependencies: librb_dep,
- install: true,
- install_rpath: rpath
+ install: true
)
diff --git a/shell/meson.build b/shell/meson.build
index 23db7921a..930425ab0 100644
--- a/shell/meson.build
+++ b/shell/meson.build
@@ -149,6 +149,5 @@ endif
executable('rhythmbox', 'main.c',
dependencies: rhythmbox_dependencies,
include_directories: [ pluginsinc ],
- install: true,
- install_rpath: rpath
+ install: true
)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]