[rhythmbox/wip/davidk/install-rpath: 9/9] 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: 9/9] build: Do not set install_rpath
- Date: Mon, 9 May 2022 12:53:49 +0000 (UTC)
commit 5ca73606629f72a6225249edf1d6067d28821c84
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 042be93c6..f43496554 100644
--- a/meson.build
+++ b/meson.build
@@ -301,8 +301,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 071406d25..4f096082c 100644
--- a/metadata/meson.build
+++ b/metadata/meson.build
@@ -60,8 +60,7 @@ executable('rhythmbox-metadata', metadata_service_sources,
link_with: rbmetadata_lib,
dependencies: [librb_dep, rbmetadata_dep, intl],
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 78e5d91d1..3a8c87a57 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, intl],
- install: true,
- install_rpath: rpath
+ install: true
)
diff --git a/shell/meson.build b/shell/meson.build
index f65bbd114..10c4c8ee8 100644
--- a/shell/meson.build
+++ b/shell/meson.build
@@ -150,6 +150,5 @@ executable('rhythmbox', 'main.c',
dependencies: [ rhythmbox_dependencies, intl ],
c_args: shell_c_args,
include_directories: [ pluginsinc ],
- install: true,
- install_rpath: rpath
+ install: true
)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]