[gdm/benzea/fix-locale-dir: 39/39] meson: Fix location of locale directory




commit 5d5bc0f4e46a6e926fd779401374b121a992d3de
Author: Benjamin Berg <bberg redhat com>
Date:   Fri Oct 23 13:51:04 2020 +0200

    meson: Fix location of locale directory
    
    The localedir is relative to the prefix and not the data directory. This
    regressed during the meson port where the get_option('datadir') was
    accidentally inserted into the GNOMELOCALEDIR definition.
    
    Closes #635

 meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/meson.build b/meson.build
index 1979cfe5..a729792c 100644
--- a/meson.build
+++ b/meson.build
@@ -205,7 +205,7 @@ conf.set_quoted('GDM_SCREENSHOT_DIR', gdm_screenshot_dir)
 conf.set_quoted('GDM_XAUTH_DIR', gdm_xauth_dir)
 conf.set_quoted('GDM_RAN_ONCE_MARKER_DIR', ran_once_marker_dir)
 conf.set_quoted('GDM_RUN_DIR', gdm_run_dir)
-conf.set_quoted('GNOMELOCALEDIR', gdm_prefix / get_option('datadir') / get_option('localedir'))
+conf.set_quoted('GNOMELOCALEDIR', gdm_prefix / get_option('localedir'))
 conf.set_quoted('AT_SPI_REGISTRYD_DIR', at_spi_registryd_dir)
 conf.set_quoted('GDM_PID_FILE', gdm_pid_file)
 conf.set_quoted('GNOME_SETTINGS_DAEMON_DIR', gnome_settings_daemon_dir)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]