From: Kevin Roy Date: Tue, 28 Sep 2010 15:00:21 +0200 Subject: [PATCH] install_in_usr_lib * Arch-specific files go to /usr/lib rather than /usr/share. * Make blender look for systemdir into /usr/lib instead of /usr/share * Remove blender_version from system directory result --- intern/ghost/intern/GHOST_SystemX11.cpp | 2 +- source/blender/blenlib/BLI_path_util.h | 2 +- source/blender/blenlib/intern/path_util.c | 2 +- source/creator/CMakeLists.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/intern/ghost/intern/GHOST_SystemX11.cpp b/intern/ghost/intern/GHOST_SystemX11.cpp index 9a5ac2b..a323212 100644 --- a/intern/ghost/intern/GHOST_SystemX11.cpp +++ b/intern/ghost/intern/GHOST_SystemX11.cpp @@ -1465,7 +1465,7 @@ void GHOST_SystemX11::putClipboard(GHOST_TInt8 *buffer, bool selection) const const GHOST_TUns8* GHOST_SystemX11::getSystemDir() const { - return (GHOST_TUns8*) PREFIX "/share"; + return (GHOST_TUns8*) PREFIX "/lib"; } const GHOST_TUns8* GHOST_SystemX11::getUserDir() const diff --git a/source/blender/blenlib/BLI_path_util.h b/source/blender/blenlib/BLI_path_util.h index 74fb673..1983de5 100644 --- a/source/blender/blenlib/BLI_path_util.h +++ b/source/blender/blenlib/BLI_path_util.h @@ -84,7 +84,7 @@ char *BLI_get_folder_create(int folder_id, char *subfolder); #define BLENDER_SYSTEM_FORMAT "%s/Blender/%s" #else #define BLENDER_USER_FORMAT "%s/.blender/%s" -#define BLENDER_SYSTEM_FORMAT "%s/blender/%s" +#define BLENDER_SYSTEM_FORMAT "%s/blender" #endif void BLI_setenv(const char *env, const char *val); diff --git a/source/blender/blenlib/intern/path_util.c b/source/blender/blenlib/intern/path_util.c index e1d736d..3452e46 100644 --- a/source/blender/blenlib/intern/path_util.c +++ b/source/blender/blenlib/intern/path_util.c @@ -920,7 +920,7 @@ static int get_path_system(char *targetpath, char *folder_name, char *subfolder_ system_base_path = (const char *)GHOST_getSystemDir(); if (system_base_path) { - BLI_snprintf(system_path, FILE_MAX, BLENDER_SYSTEM_FORMAT, system_base_path, blender_version_decimal()); + BLI_snprintf(system_path, FILE_MAX, BLENDER_SYSTEM_FORMAT, system_base_path); } if(!system_path[0]) diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index 2828825..420a02f 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -71,7 +71,7 @@ IF(NOT WITH_SDL) ENDIF(NOT WITH_SDL) IF(UNIX AND NOT APPLE) - SET(BLENDERPATH ${CMAKE_INSTALL_PREFIX}/share/blender/${BLENDER_VERSION}) + SET(BLENDERPATH ${CMAKE_INSTALL_PREFIX}/lib/blender) # blender_path in creator.c ADD_DEFINITIONS(-DBLENDERPATH="${BLENDERPATH}") ENDIF(UNIX AND NOT APPLE) --