[gnome-shell/benzea/systemd-user-units: 87/87] meson: Avoid using relative paths to po directory
- From: Benjamin Berg <bberg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell/benzea/systemd-user-units: 87/87] meson: Avoid using relative paths to po directory
- Date: Thu, 20 Jun 2019 09:34:29 +0000 (UTC)
commit ffb6c25bbc57a89c2fdc588a5246296e8d19f94f
Author: Benjamin Berg <bberg redhat com>
Date: Fri Apr 26 12:33:58 2019 +0200
meson: Avoid using relative paths to po directory
Replace the relative path to the po directory with a toplevel definition
of po_dir and use that instead.
https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/507
data/meson.build | 4 ++--
meson.build | 2 ++
src/calendar-server/meson.build | 2 +-
3 files changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/data/meson.build b/data/meson.build
index 868232ec2..11812600b 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -24,7 +24,7 @@ foreach desktop_file : desktop_files
configuration: desktopconf
),
output: desktop_file,
- po_dir: '../po',
+ po_dir: po_dir,
install: true,
install_dir: desktopdir,
type: 'desktop'
@@ -38,7 +38,7 @@ i18n.merge_file('desktop',
configuration: desktopconf
),
output: 'gnome-shell-extension-disabled-warning.desktop',
- po_dir: '../po',
+ po_dir: po_dir,
install: true,
install_dir: autostartdir,
type: 'desktop'
diff --git a/meson.build b/meson.build
index f9814764d..f4d411744 100644
--- a/meson.build
+++ b/meson.build
@@ -238,6 +238,8 @@ libgvc = subproject('gvc',
)
libgvc_gir = libgvc.get_variable('libgvc_gir')
+po_dir = join_paths(meson.current_source_dir(), 'po')
+
subdir('js')
subdir('src')
subdir('po')
diff --git a/src/calendar-server/meson.build b/src/calendar-server/meson.build
index a7393fce5..7363282a5 100644
--- a/src/calendar-server/meson.build
+++ b/src/calendar-server/meson.build
@@ -30,7 +30,7 @@ configure_file(
i18n.merge_file('evolution-calendar.desktop',
input: 'evolution-calendar.desktop.in',
output: 'evolution-calendar.desktop',
- po_dir: '../../po',
+ po_dir: po_dir,
install: true,
install_dir: desktopdir,
type: 'desktop'
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]