util/xmlconfig: inline datadir
authorEric Engestrom <eric@igalia.com>
Fri, 13 Oct 2023 16:29:54 +0000 (17:29 +0100)
committerMarge Bot <emma+marge@anholt.net>
Mon, 16 Oct 2023 07:59:38 +0000 (07:59 +0000)
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>

src/util/xmlconfig.c

index fbd034e..7a753e3 100644 (file)
@@ -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");
    }