[balsa] Make an absolute path to the po dir for soundlist



commit 6d15149b5f352cf5ce0dc422834af4fabeccba47
Author: Peter Bloomfield <PeterBloomfield bellsouth net>
Date:   Thu Sep 21 18:17:18 2017 -0400

    Make an absolute path to the po dir for soundlist
    
        * sounds/meson.build: make an absolute path to the po dir.

 ChangeLog          |    4 ++++
 sounds/meson.build |   40 ++++++++++++++++++----------------------
 2 files changed, 22 insertions(+), 22 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index c30e365..d626395 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2017-09-21  Peter Bloomfield  <pbloomfield bellsouth net>
+
+       * sounds/meson.build: make an absolute path to the po dir.
+
 2017-09-20  Peter Bloomfield  <pbloomfield bellsouth net>
 
        Pass '-lz' link argument as a dependency of libimap instead of through
diff --git a/sounds/meson.build b/sounds/meson.build
index 8512055..f0934d8 100644
--- a/sounds/meson.build
+++ b/sounds/meson.build
@@ -7,25 +7,21 @@ install_data(balsa_sounds, install_dir : balsa_sounds_dir)
 
 sound_list_dir = join_paths(get_option('sysconfdir'), 'sound', 'events')
 
-i18n_merge_knows_description = false
-if i18n_merge_knows_description
-  i18n.merge_file(input       : 'balsa.soundlist.meson',
-                  output      : 'balsa.soundlist',
-                  type        : 'desktop',
-                  po_dir      : '../po',
-                  install     : true,
-                  install_dir : sound_list_dir)
-else
-  custom_target('soundlist-file',
-                input       : 'balsa.soundlist.meson',
-                output      : 'balsa.soundlist',
-                install     : true,
-                install_dir : sound_list_dir,
-                command: [
-                  'msgfmt', '--desktop',
-                  '--keyword', 'description',
-                  '--template', '@INPUT@',
-                  '-d', '../po',
-                  '-o', '@OUTPUT@'
-                  ])
-endif
+# if i18n_merge knew about the 'description' keyword, we would use:
+# i18n.merge_file(input       : 'balsa.soundlist.meson',
+#                 output      : 'balsa.soundlist',
+#                 type        : 'desktop',
+#                 po_dir      : '../po',
+#                 install     :  true,
+#                 install_dir :  sound_list_dir)
+# instead:
+custom_target('soundlist-file',
+              input       : 'balsa.soundlist.meson',
+              output      : 'balsa.soundlist',
+              install     : true,
+              install_dir : sound_list_dir,
+              command     : ['msgfmt', '--desktop',
+                             '--keyword',     'description',
+                             '--template',    '@INPUT@',
+                             '-d',             join_paths(meson.current_source_dir(), '../po'),
+                             '--output-file', '@OUTPUT@'])


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]