Repository navigation
Expand file tree
/
Copy pathfix-libdia-install-dir.patch
More file actions
99 lines (94 loc) · 3.19 KB
/
Copy pathfix-libdia-install-dir.patch
File metadata and controls
99 lines (94 loc) · 3.19 KB
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
From: Philippe SWARTVAGHER <[email protected]>
Date: Sat, 17 Feb 2024 17:43:43 +0100
Subject: Install libdia.so in the correct folder
Last-Update: 2022-05-26
Forwarded: not-needed
---
app/meson.build | 3 ++-
lib/meson.build | 1 +
objects/meson.build | 1 +
plug-ins/layout/meson.build | 1 +
plug-ins/meson.build | 1 +
plug-ins/python/meson.build | 3 ++-
plug-ins/xslt/meson.build | 1 +
7 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/app/meson.build b/app/meson.build
index e56d556..6f0022c 100644
--- a/app/meson.build
+++ b/app/meson.build
@@ -136,7 +136,8 @@ diaapp = executable('dia',
dependencies: [diaapp_dep] + [config_dep],
win_subsystem: 'windows',
export_dynamic: true, # some plugins require this.
- install: true)
+ install: true,
+ install_rpath: dialibdir)
if build_machine.system() == 'windows'
dia_win_remote = executable(
diff --git a/lib/meson.build b/lib/meson.build
index f1ffb96..0de640c 100644
--- a/lib/meson.build
+++ b/lib/meson.build
@@ -238,6 +238,7 @@ libdia_lib = library('dia',
c_args: ['-Wall', '-DLIBDIA_COMPILATION'],
vs_module_defs: 'libdia.def',
install: true,
+ install_dir: dialibdir,
)
libdia_dep = declare_dependency (include_directories: libdia_inc,
diff --git a/objects/meson.build b/objects/meson.build
index 278020f..3884654 100644
--- a/objects/meson.build
+++ b/objects/meson.build
@@ -26,5 +26,6 @@ foreach o : dia_object_desc
install: true,
install_dir: dialibdir,
name_suffix: g_module_suffix,
+ install_rpath: dialibdir,
)
endforeach
diff --git a/plug-ins/layout/meson.build b/plug-ins/layout/meson.build
index 968127e..20ca47a 100644
--- a/plug-ins/layout/meson.build
+++ b/plug-ins/layout/meson.build
@@ -22,4 +22,5 @@ shared_module(
install_dir: dialibdir,
include_directories: diaapp_inc,
name_suffix: g_module_suffix,
+ install_rpath: dialibdir
)
diff --git a/plug-ins/meson.build b/plug-ins/meson.build
index c503ca7..5c33d67 100644
--- a/plug-ins/meson.build
+++ b/plug-ins/meson.build
@@ -41,5 +41,6 @@ foreach p : install_plugins_desc
install: p.get('install', true),
install_dir: dialibdir,
name_suffix: g_module_suffix,
+ install_rpath: dialibdir
)
endforeach
diff --git a/plug-ins/python/meson.build b/plug-ins/python/meson.build
index e307d4d..d15c566 100644
--- a/plug-ins/python/meson.build
+++ b/plug-ins/python/meson.build
@@ -56,7 +56,8 @@ if py3_dep.found()
# Python headers trigger this warning. Let's not obscure the others.
c_args: [
'-Wno-declaration-after-statement',
- ]
+ ],
+ install_rpath: dialibdir,
)
install_data(python_scripts, install_dir: pkgdatadir / 'python')
diff --git a/plug-ins/xslt/meson.build b/plug-ins/xslt/meson.build
index 12eb1bb..7b2c649 100644
--- a/plug-ins/xslt/meson.build
+++ b/plug-ins/xslt/meson.build
@@ -26,5 +26,6 @@ if libxslt_dep.found()
install: true,
install_dir: dialibdir,
name_suffix: g_module_suffix,
+ install_rpath: dialibdir
)
endif