From: Eric Engestrom <eric@igalia.com>
Date: Fri, 13 Oct 2023 16:29:54 +0000 (+0100)
Subject: util/xmlconfig: inline datadir
X-Git-Tag: upstream/23.3.3~718
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=042d256c1e215feeb7520bcffa8cad16ff18a548;p=platform%2Fupstream%2Fmesa.git

util/xmlconfig: inline datadir

Reviewed-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Erik Faye-Lund <erik.faye-lund@collabora>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21808>
---

diff --git a/src/util/xmlconfig.c b/src/util/xmlconfig.c
index fbd034e..7a753e3 100644
--- a/src/util/xmlconfig.c
+++ b/src/util/xmlconfig.c
@@ -1173,7 +1173,6 @@ initOptionCache(driOptionCache *cache, const driOptionCache *info)
 #define DATADIR "/usr/share"
 #endif
 
-static const char *datadir = DATADIR "/drirc.d";
 static const char *execname;
 
 void
@@ -1216,7 +1215,7 @@ driParseConfigFiles(driOptionCache *cache, const driOptionCache *info,
    if ((configdir = getenv("DRIRC_CONFIGDIR")))
       parseConfigDir(&userData, configdir);
    else {
-      parseConfigDir(&userData, datadir);
+      parseConfigDir(&userData, DATADIR "/drirc.d");
       parseOneConfigFile(&userData, SYSCONFDIR "/drirc");
    }