From: "Matteo F. Vescovi" Date: Tue, 18 Jan 2022 23:50:42 +0100 Subject: do_not_use_version_number_in_system_path Global installation expects system path to be something like /usr/share/blender/scripts/ without version numbers. Contributions by: Antonio Ospite --- intern/ghost/intern/GHOST_SystemPathsUnix.cpp | 3 +++ source/creator/CMakeLists.txt | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/intern/ghost/intern/GHOST_SystemPathsUnix.cpp b/intern/ghost/intern/GHOST_SystemPathsUnix.cpp index 7239678..174696e 100644 --- a/intern/ghost/intern/GHOST_SystemPathsUnix.cpp +++ b/intern/ghost/intern/GHOST_SystemPathsUnix.cpp @@ -57,6 +57,9 @@ GHOST_SystemPathsUnix::~GHOST_SystemPathsUnix() const char *GHOST_SystemPathsUnix::getSystemDir(int, const char *versionstr) const { + /* XXX On Debian ignore versionstr when building the system path */ + versionstr = ""; + /* no prefix assumes a portable build which only uses bundled scripts */ if (static_path) { static string system_path = string(static_path) + "/blender/" + versionstr; diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index ed03aac..83779a8 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -328,7 +328,7 @@ if(UNIX AND NOT APPLE) if(WITH_INSTALL_PORTABLE) set(TARGETDIR_VER ${BLENDER_VERSION}) else() - set(TARGETDIR_VER share/blender/${BLENDER_VERSION}) + set(TARGETDIR_VER share/blender) endif() endif()