From 31968ea53c075c71f1d664fa89fda98551bee9a0 Mon Sep 17 00:00:00 2001
From: Benjamin Berg <bberg@redhat.com>
Date: Fri, 26 Apr 2019 12:33:58 +0200
Subject: [PATCH] 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                | 2 +-
 meson.build                     | 2 ++
 src/calendar-server/meson.build | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/data/meson.build b/data/meson.build
index 93a9391ea..88a61765f 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'
diff --git a/meson.build b/meson.build
index 307cd6be6..4dedaac3c 100644
--- a/meson.build
+++ b/meson.build
@@ -243,6 +243,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'