Pileus Git - ~andy/sunrise/blob - games-action/minetest/files/minetest-0.4_pre20120408-sharepath.patch

   1 From: Julian Ospald <julian.ospald@googlemail.com>
   2 Date: Tue Apr  3 03:33:30 UTC 2012
   3
   4 make path_share look explicitly in SHAREDIR instead of potentially-broken
   5 relative path
   6
   7 --- src/porting.cpp
   8 +++ src/porting.cpp
   9 @@ -244,7 +244,7 @@
  10
  11         pathRemoveFile(buf, '/');
  12
  13 -       path_share = std::string(buf) + "/../share/" + PROJECT_NAME;
  14 +       path_share = std::string(SHAREDIR);
  15         //path_share = std::string(INSTALL_PREFIX) + "/share/" + PROJECT_NAME;
  16         if (!fs::PathExists(path_share)) {
  17                 dstream<<"WARNING: system-wide share not found at \""<<path_share<<"\"";
  18 --- src/cmake_config.h.in
  19 +++ src/cmake_config.h.in
  20 @@ -4,6 +4,7 @@
  21  #define CMAKE_CONFIG_H
  22
  23  #define CMAKE_PROJECT_NAME "@PROJECT_NAME@"
  24 +#define SHAREDIR "@SHAREDIR@"
  25  #define CMAKE_INSTALL_PREFIX "@CMAKE_INSTALL_PREFIX@"
  26  #define CMAKE_VERSION_STRING "@VERSION_STRING@"
  27  #ifdef NDEBUG