minetest
/
minetest
mirror of https://github.com/minetest/minetest.git
1
0
Fork 0
Code Issues Releases Wiki Activity

fix path_share 

make path_share look explicitly in SHAREDIR instead of potentially-broken
relative path
This commit is contained in:
hasufell 2012-04-03 07:00:22 +02:00
parent 8d2419af1b
commit 9531a2a768
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/cmake_config.h.in
View File

@ -4,6 +4,7 @@
#define CMAKE_CONFIG_H
#define CMAKE_PROJECT_NAME "@PROJECT_NAME@"
#define SHAREDIR "@SHAREDIR@"
#define CMAKE_INSTALL_PREFIX "@CMAKE_INSTALL_PREFIX@"
#define CMAKE_VERSION_STRING "@VERSION_STRING@"
#ifdef NDEBUG

2
src/porting.cpp
View File

@ -259,7 +259,7 @@ void initializePaths()
pathRemoveFile(buf, '/');
path_share = std::string(buf) + "/../share/" + PROJECT_NAME;
path_share = std::string(SHAREDIR);
//path_share = std::string(INSTALL_PREFIX) + "/share/" + PROJECT_NAME;
if (!fs::PathExists(path_share)) {
dstream<<"WARNING: system-wide share not found at \""<<path_share<<"\"";