[gdm: 2/11] meson: Obey at -Dcustom-conf option when installing custom.conf
- From: Ray Strode <halfline src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gdm: 2/11] meson: Obey at -Dcustom-conf option when installing custom.conf
- Date: Mon, 31 Aug 2020 13:28:03 +0000 (UTC)
commit 1cf8c4d426658d35bd7834a95c0e8816e1787c87
Author: Marco Trevisan (TreviƱo) <marco ubuntu com>
Date: Fri Aug 28 05:19:16 2020 +0200
meson: Obey at -Dcustom-conf option when installing custom.conf
No matter what parameter was passed to gdm, the custom.conf was always
installed in $gdmcomnfdir/custom.conf, even if the config.h was using the
configured path.
Ensure that we use the passed argument, setting its name as configure_file
output and its path as the install_dir.
Unfortunately we've to be hackish here, using coreutils tools until we
require meson 0.53 (and can use its FS module).
data/meson.build | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/data/meson.build b/data/meson.build
index b24f7c0b..bbcad589 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -34,10 +34,10 @@ configure_file(
)
configure_file(
input: 'gdm.conf-custom.in',
- output: 'custom.conf',
+ output: gdm_custom_conf.split('/')[-1],
copy: true,
install_mode: 'rw-r--r--',
- install_dir: gdmconfdir,
+ install_dir: run_command(find_program('dirname'), gdm_custom_conf).stdout().strip(),
)
# GSettings schema
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]