simplify libgamemodeauto preloading

Signed-off-by: Stephan Lachnit <stephanlachnit@protonmail.com>

data/gamemoderun

@@ -0,0 +1,9 @@
+#!/bin/bash
+# Helper script to launch games with gamemode
+
+GAMEMODEAUTO_NAME="libgamemodeauto.so.0"
+
+# ld will find the right path to load the library, including for 32-bit apps.
+LD_PRELOAD="${GAMEMODEAUTO_NAME}${LD_PRELOAD:+:$LD_PRELOAD}"
+
+exec $GAMEMODERUNEXEC env LD_PRELOAD="${LD_PRELOAD}" "$@"

data/gamemoderun.in

@@ -1,10 +0,0 @@
-#!/bin/bash
-# Helper script to launch games with gamemode
-
-# Path to installed libgamemodeauto. ld.so will substitute "\$LIB" to get the
-# appropriate path depending on whether the app is 32- or 64-bit.
-GAMEMODEAUTO="@GAMEMODERUN_PREFIX@libgamemodeauto.so.0"
-
-LD_PRELOAD="${GAMEMODEAUTO}${LD_PRELOAD:+:$LD_PRELOAD}"
-
-exec $GAMEMODERUNEXEC env LD_PRELOAD="${LD_PRELOAD}" "$@"

data/meson.build

@@ -4,14 +4,6 @@ data_conf.set('LIBEXECDIR', path_libexecdir)
 data_conf.set('GAMEMODE_PREFIX', path_prefix)
 data_conf.set('GAMEMODE_VERSION', meson.project_version())
 
-# Set gamemoderun lib dir
-gamemoderun_lib_dir = get_option('with-gamemoderun-lib-dir')
-if gamemoderun_lib_dir == 'default'
-    data_conf.set('GAMEMODERUN_PREFIX', path_prefix + '/\$LIB/')
-else
-    data_conf.set('GAMEMODERUN_PREFIX', gamemoderun_lib_dir)
-endif
-
 # Pull in the example config
 config_example = run_command(
     'cat',
@@ -47,10 +39,8 @@ configure_file(
 )
 
 # Install the helper run script
-configure_file(
-    input: 'gamemoderun.in',
-    output: 'gamemoderun',
-    configuration: data_conf,
+install_data(
+    files('gamemoderun'),
     install_dir: path_bindir,
     install_mode: 'rwxr-xr-x',
 )

meson_options.txt

@@ -10,9 +10,6 @@ option('with-systemd-user-unit-dir', type: 'string', description: 'Explicitly se
 # Not using systemd
 option('with-dbus-service-dir', type: 'string', description: 'Explicitly set the D-BUS session directory')
 
-# lib dir in gamemoderun
-option('with-gamemoderun-lib-dir', type: 'string', value: 'default', description: 'Explicitly set lib dir in gamemoderun')
-
 # General options
 option('with-examples', type: 'boolean', description: 'Build sample programs', value: 'true')
 option('with-util', type: 'boolean', description: 'Build the utilities', value: 'true')