|
 |
6fcf6b |
From a18f091c6c090b93cd816f8cd5be763b6e238632 Mon Sep 17 00:00:00 2001
|
|
|
6fcf6b |
From: Philip Withnall <withnall@endlessm.com>
|
|
|
6fcf6b |
Date: Fri, 7 Feb 2020 17:10:23 +0000
|
|
|
6fcf6b |
Subject: [PATCH] libcharset: Drop a redundant environment variable
|
|
|
6fcf6b |
|
|
|
6fcf6b |
It was used for running tests when we built with autotools, but is no
|
|
|
6fcf6b |
longer used in the Meson build system. If we need something similar in
|
|
|
6fcf6b |
future, it should be done by adding internal API to override the
|
|
|
6fcf6b |
directory on a per-call basis, rather than loading a path from a shared
|
|
|
6fcf6b |
global table every time.
|
|
|
6fcf6b |
|
|
|
6fcf6b |
Signed-off-by: Philip Withnall <withnall@endlessm.com>
|
|
|
6fcf6b |
|
|
|
6fcf6b |
Helps: #1919
|
|
|
6fcf6b |
---
|
|
|
6fcf6b |
glib/libcharset/localcharset.c | 6 +-----
|
|
|
6fcf6b |
1 file changed, 1 insertion(+), 5 deletions(-)
|
|
|
6fcf6b |
|
|
|
6fcf6b |
diff --git a/glib/libcharset/localcharset.c b/glib/libcharset/localcharset.c
|
|
|
6fcf6b |
index 0c4d544be..ab3a2678d 100644
|
|
|
6fcf6b |
--- a/glib/libcharset/localcharset.c
|
|
|
6fcf6b |
+++ b/glib/libcharset/localcharset.c
|
|
|
6fcf6b |
@@ -117,11 +117,7 @@ _g_locale_get_charset_aliases (void)
|
|
|
6fcf6b |
const char *base = "charset.alias";
|
|
|
6fcf6b |
char *file_name;
|
|
|
6fcf6b |
|
|
|
6fcf6b |
- /* Make it possible to override the charset.alias location. This is
|
|
|
6fcf6b |
- necessary for running the testsuite before "make install". */
|
|
|
6fcf6b |
- dir = getenv ("CHARSETALIASDIR");
|
|
|
6fcf6b |
- if (dir == NULL || dir[0] == '\0')
|
|
|
6fcf6b |
- dir = relocate (GLIB_CHARSETALIAS_DIR);
|
|
|
6fcf6b |
+ dir = relocate (GLIB_CHARSETALIAS_DIR);
|
|
|
6fcf6b |
|
|
|
6fcf6b |
/* Concatenate dir and base into freshly allocated file_name. */
|
|
|
6fcf6b |
{
|
|
|
6fcf6b |
--
|
|
|
6fcf6b |
2.31.1
|
|
|
6fcf6b |
|