From 62179bbf99c742ac52112ec2aa656de5ac8f6d13 Mon Sep 17 00:00:00 2001 From: raveit65 Date: Thu, 10 Sep 2020 10:12:22 +0200 Subject: Revert "Meson Project: some optimizations" This reverts commit c0c36501cfeadc0f526610891b6dd257ce3c8229. --- data/meson.build | 19 +++++++++++++------ meson_options.txt | 2 +- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/data/meson.build b/data/meson.build index 627f46d..ad34149 100644 --- a/data/meson.build +++ b/data/meson.build @@ -1,22 +1,28 @@ -common_desktop_data = configuration_data() -common_desktop_data.set('VERSION', meson.project_version()) +preferences_desktop_data = configuration_data() +preferences_desktop_data.set('VERSION', meson.project_version()) preferences_desktop = configure_file( input: 'mate-power-preferences.desktop.in.in', output: 'mate-power-preferences.desktop.in', - configuration: common_desktop_data + configuration: preferences_desktop_data ) +statistics_desktop_data = configuration_data() +statistics_desktop_data.set('VERSION', meson.project_version()) + statistics_desktop = configure_file( input: 'mate-power-statistics.desktop.in.in', output: 'mate-power-statistics.desktop.in', - configuration: common_desktop_data + configuration: statistics_desktop_data ) +mpm_autostart_data = configuration_data() +mpm_autostart_data.set('VERSION', meson.project_version()) + mpm_autostart = configure_file( input: 'mate-power-manager.desktop.in.in', output: 'mate-power-manager.desktop.in', - configuration: common_desktop_data + configuration: mpm_autostart_data ) mpm_service_data = configuration_data() @@ -75,7 +81,8 @@ install_man( 'mate-power-backlight-helper.1', 'mate-power-statistics.1', 'mate-power-preferences.1' - ] + ], + install_dir: mandir_path ) install_data( diff --git a/meson_options.txt b/meson_options.txt index f3f1a88..c8ed4ef 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,4 +1,4 @@ -option('deprecated', type: 'boolean', value: false, description: 'Warn about deprecated usages') +option('enable-deprecated', type: 'boolean', value: false, description: 'Warn about deprecated usages') option('keyring', type: 'feature', value: 'auto', description: 'Enable the use of gnome-keyring') option('applets', type: 'feature', value: 'enabled', description: 'Build the extra power applets') option('with-dbus-services', type: 'string', description: 'where D-BUS services directory is') -- cgit v1.2.1