diff options
| author | Iain Lane <iain@orangesquash.org.uk> | 2020-10-13 16:51:30 +0000 |
|---|---|---|
| committer | Iain Lane <iain@orangesquash.org.uk> | 2020-10-13 16:51:30 +0000 |
| commit | fb319044165f2b4c6e194cf26380c29efc675f64 (patch) | |
| tree | ebd23013ebae8820b1feb2562e53cfedf304ecb1 | |
| parent | 083f54f5aeaa72e0b2ebb8ba176e403751f63232 (diff) | |
| parent | 9d841d681f3d1c58e3df51a98421257f774cd185 (diff) | |
| download | gdm-fb319044165f2b4c6e194cf26380c29efc675f64.tar.gz | |
Merge branch 'benzea/fix-runtime-confi-location' into 'master'
meson: Fix default location of runtime configuration
Closes #641
See merge request GNOME/gdm!114
| -rw-r--r-- | meson.build | 2 |
1 files changed, 1 insertions, 1 deletions
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' |