From 16a0750ed2f6b75ef67615e7bbeead04bc064636 Mon Sep 17 00:00:00 2001 From: Ikey Doherty Date: Tue, 14 Nov 2017 23:55:02 +0000 Subject: [PATCH] Revert "data: If we're using snap mode, configure frontend to use lsi-exec" This reverts commit 657a91100424e4cc0e336623fb3e2e7494b02879. --- ...{lsi-settings.desktop.in => lsi-settings.desktop} | 2 +- data/meson.build | 12 ++---------- 2 files changed, 3 insertions(+), 11 deletions(-) rename data/{lsi-settings.desktop.in => lsi-settings.desktop} (90%) diff --git a/data/lsi-settings.desktop.in b/data/lsi-settings.desktop similarity index 90% rename from data/lsi-settings.desktop.in rename to data/lsi-settings.desktop index 50989b9..73a5891 100644 --- a/data/lsi-settings.desktop.in +++ b/data/lsi-settings.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Name=Linux Steam Integration Comment=Application for managing Steam integration settings -Exec=@LSI_SETTINGS@ +Exec=lsi-settings Icon=steam Terminal=false Type=Application diff --git a/data/meson.build b/data/meson.build index 58f9b6b..5e96af9 100644 --- a/data/meson.build +++ b/data/meson.build @@ -2,16 +2,8 @@ appsdir = join_paths(datadir, 'applications') # If frontend is enabled, install lsi-settings.desktop if with_frontend == true - data_conf = configuration_data() - if with_snap_support == true - data_conf.set('LSI_SETTINGS', '$SNAP/bin/lsi-exec $SNAP/bin/lsi-settings') - else - data_conf.set('LSI_SETTINGS', 'lsi-settings') - endif - configure_file( - input: 'lsi-settings.desktop.in', - output: 'lsi-settings.desktop', - configuration: data_conf, + install_data( + 'lsi-settings.desktop', install_dir: appsdir, ) endif