Skip to content

Commit

Permalink
libcharset: Drop a redundant environment variable
Browse files Browse the repository at this point in the history
It was used for running tests when we built with autotools, but is no
longer used in the Meson build system. If we need something similar in
future, it should be done by adding internal API to override the
directory on a per-call basis, rather than loading a path from a shared
global table every time.

Signed-off-by: Philip Withnall <withnall@endlessm.com>

Helps: #1919
  • Loading branch information
pwithnall committed Feb 7, 2020
1 parent 65be80c commit 3529bb4
Showing 1 changed file with 1 addition and 5 deletions.
6 changes: 1 addition & 5 deletions glib/libcharset/localcharset.c
Original file line number Diff line number Diff line change
Expand Up @@ -117,11 +117,7 @@ _g_locale_get_charset_aliases (void)
const char *base = "charset.alias";
char *file_name;

/* Make it possible to override the charset.alias location. This is
necessary for running the testsuite before "make install". */
dir = getenv ("CHARSETALIASDIR");
if (dir == NULL || dir[0] == '\0')
dir = relocate (GLIB_CHARSETALIAS_DIR);
dir = relocate (GLIB_CHARSETALIAS_DIR);

/* Concatenate dir and base into freshly allocated file_name. */
{
Expand Down

0 comments on commit 3529bb4

Please sign in to comment.