[gdm/benzea/fix-runtime-confi-location: 35/35] meson: Fix default location of runtime configuration

[Benjamin Berg <bberg src gnome org>]

commit 9d841d681f3d1c58e3df51a98421257f774cd185
Author: Benjamin Berg <bberg redhat com>
Date:   Tue Oct 6 18:00:29 2020 +0200

    meson: Fix default location of runtime configuration
    
    The meson port changed the runtime configuration location to default to
    the same location as the default configuration. This however is
    incorrect, as the runtime configuration should be in the runtime
    directory.
    
    Change the default to be "custom.conf" inside the runtime directory.
    
    Fixes: #641

 meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/meson.build b/meson.build
index 7e336bfa..c059a135 100644
--- a/meson.build
+++ b/meson.build
@@ -24,10 +24,10 @@ pam_mod_dir = (get_option('pam-mod-dir') != '')? get_option('pam-mod-dir') : gdm
 dbus_sys_dir = (get_option('dbus-sys') != '')? get_option('dbus-sys') : get_option('sysconfdir') / 'dbus-1' 
/ 'system.d'
 gdm_defaults_conf = (get_option('defaults-conf') != '')? get_option('defaults-conf') : gdm_prefix / 
get_option('datadir') / 'gdm' / 'defaults.conf'
 gdm_custom_conf = (get_option('custom-conf') != '')? get_option('custom-conf') : gdmconfdir / 'custom.conf'
-gdm_runtime_conf = (get_option('runtime-conf') != '')? get_option('runtime-conf') : gdm_custom_conf
 gnome_settings_daemon_dir = (get_option('gnome-settings-daemon-dir') != '')? 
get_option('gnome-settings-daemon-dir') : gdm_prefix / get_option('libexecdir')
 check_accelerated_dir = (get_option('check-accelerated-dir') != '')? get_option('check-accelerated-dir') : 
gdm_prefix / get_option('libexecdir')
 gdm_run_dir = (get_option('run-dir') != '')? get_option('run-dir') : gdm_prefix / 
get_option('localstatedir') / 'run' / 'gdm'
+gdm_runtime_conf = (get_option('runtime-conf') != '')? get_option('runtime-conf') : gdm_run_dir / 
'custom.conf'
 gdm_pid_file = (get_option('pid-file') != '')? get_option('pid-file') : gdm_run_dir / 'gdm.pid'
 ran_once_marker_dir = (get_option('ran-once-marker-dir') != '')? get_option('ran-once-marker-dir') : 
gdm_run_dir
 working_dir = (get_option('working-dir') != '')? get_option('working-dir') : gdm_prefix / 
get_option('localstatedir') / 'lib' / 'gdm'