51 lines
1.6 KiB
Diff
51 lines
1.6 KiB
Diff
From 1a6737f4a26c38f3c703d84263d0a0779a607359 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
|
|
Date: Wed, 21 Apr 2021 14:49:36 +0200
|
|
Subject: [PATCH] build: Set rpath on executable
|
|
|
|
---
|
|
meson.build | 1 +
|
|
src/meson.build | 1 +
|
|
tests/meson.build | 1 +
|
|
3 files changed, 3 insertions(+)
|
|
|
|
diff --git a/meson.build b/meson.build
|
|
index 9d7bda1..9148eb9 100644
|
|
--- a/meson.build
|
|
+++ b/meson.build
|
|
@@ -75,6 +75,7 @@ top_srcdir = meson.current_source_dir()
|
|
builddir = meson.current_build_dir()
|
|
|
|
prefix = get_option('prefix')
|
|
+libdir = join_paths(prefix, get_option('libdir'))
|
|
libexecdir = join_paths(prefix, get_option('libexecdir'))
|
|
datadir = join_paths(prefix, get_option('datadir'))
|
|
schemadir = join_paths(datadir, 'glib-2.0', 'schemas')
|
|
diff --git a/src/meson.build b/src/meson.build
|
|
index 843746d..3757afb 100644
|
|
--- a/src/meson.build
|
|
+++ b/src/meson.build
|
|
@@ -100,6 +100,7 @@ executable('gnome-remote-desktop-daemon',
|
|
daemon_sources,
|
|
dependencies: deps,
|
|
include_directories: [configinc],
|
|
+ install_rpath: join_paths(libdir, 'gnome-remote-desktop'),
|
|
install: true,
|
|
install_dir: libexecdir)
|
|
|
|
diff --git a/tests/meson.build b/tests/meson.build
|
|
index 978ae23..ab74a28 100644
|
|
--- a/tests/meson.build
|
|
+++ b/tests/meson.build
|
|
@@ -5,6 +5,7 @@ if have_vnc
|
|
dependencies: [glib_dep,
|
|
libvncclient_dep],
|
|
include_directories: [configinc],
|
|
+ install_rpath: join_paths(libdir, 'gnome-remote-desktop'),
|
|
install: false)
|
|
|
|
test_runner = find_program('vnc-test-runner.sh')
|
|
--
|
|
2.31.1
|
|
|