OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

util/xmlconfig: inline datadir

Browse Source 
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>
This commit is contained in:
Eric Engestrom
2023-10-13 17:29:54 +01:00
committed by Marge Bot
parent 44b0764930
commit 042d256c1e
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/util/xmlconfig.c
View File

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