[glib/mcatanzaro/glib-2-56-rhel8: 35/45] libcharset: Drop a redundant environment variable

[Michael Catanzaro <mcatanzaro src gnome org>]

commit d5a84c19c65362f7ea45b4201e2429eaa0fbf199
Author: Philip Withnall <withnall endlessm com>
Date:   Fri Feb 7 17:10:23 2020 +0000

    libcharset: Drop a redundant environment variable
    
    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

 glib/libcharset/localcharset.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)
---
diff --git a/glib/libcharset/localcharset.c b/glib/libcharset/localcharset.c
index 0c4d544be..ab3a2678d 100644
--- a/glib/libcharset/localcharset.c
+++ b/glib/libcharset/localcharset.c
@@ -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.  */
       {