[gnome-disk-utility] build: Use generators placeholders



commit 15979b130c652f4df074daa56c345adea6af8b73
Author: Iñigo Martínez <inigomartinez gmail com>
Date:   Thu Jul 4 07:49:25 2019 +0200

    build: Use generators placeholders
    
    Functions derived from generators as `configure_file`,
    `custom_target` and `i18n.merge_file` can use placeholders like
    `@BASENAME@` that removes the extension from the input filename
    string.
    
    The output string has been replaced by this placeholder that
    allows in some cases the use of less variables.

 data/meson.build       | 5 ++---
 src/notify/meson.build | 5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)
---
diff --git a/data/meson.build b/data/meson.build
index a7771018..f300b8fe 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -18,11 +18,10 @@ foreach desktop: desktops
   )
 endforeach
 
-service = 'org.gnome.DiskUtility.service'
 
 configure_file(
-  input: service + '.in',
-  output: service,
+  input: 'org.gnome.DiskUtility.service.in',
+  output: '@BASENAME@',
   configuration: {'bindir': gdu_prefix / gdu_bindir},
   install: true,
   install_dir: gdu_datadir / 'dbus-1/services',
diff --git a/src/notify/meson.build b/src/notify/meson.build
index bf0710bb..d82a4b6b 100644
--- a/src/notify/meson.build
+++ b/src/notify/meson.build
@@ -20,11 +20,10 @@ executable(
   install_dir: gdu_libexecdir,
 )
 
-desktop = 'org.gnome.SettingsDaemon.DiskUtilityNotify.desktop'
 
 configure_file(
-  input: desktop + '.in',
-  output: desktop,
+  input: 'org.gnome.SettingsDaemon.DiskUtilityNotify.desktop.in',
+  output: '@BASENAME@',
   configuration: {'libexecdir': gdu_prefix / gdu_libexecdir},
   install: true,
   install_dir: gdu_sysconfdir / 'xdg/autostart',


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