summaryrefslogtreecommitdiff
path: root/indra/llfilesystem/lldir_linux.cpp
diff options
context:
space:
mode:
authorErik Kundiman <erik@megapahit.org>2023-12-18 20:42:30 +0800
committerErik Kundiman <erik@megapahit.org>2023-12-18 20:42:30 +0800
commitb0e28d27bd990393e22ca3f474c340e77a08357b (patch)
tree31698ce16af0883d128cb4cc804c25f85650c711 /indra/llfilesystem/lldir_linux.cpp
parentee89162c037d693d63376762b417049f5f066672 (diff)
Unix install sets plugin dir to system library dir
because (at least) the vlc/plugins dirs are inside it in the same way it's been inside llplugin. This is so the app can find system VLC plugins. And for this, BUILD_SHARED_LIBS set on must work first on Linux (has already been working on FreeBSD), since libmedia_plugin_libvlc is a shared library (which now gets installed to system library dir too, on both OSes).
Diffstat (limited to 'indra/llfilesystem/lldir_linux.cpp')
-rw-r--r--indra/llfilesystem/lldir_linux.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/llfilesystem/lldir_linux.cpp b/indra/llfilesystem/lldir_linux.cpp
index 7e8fe157ba..c343728505 100644
--- a/indra/llfilesystem/lldir_linux.cpp
+++ b/indra/llfilesystem/lldir_linux.cpp
@@ -137,7 +137,11 @@ LLDir_Linux::LLDir_Linux()
}
}
+#ifdef APP_PLUGIN_DIR
+ mLLPluginDir = APP_PLUGIN_DIR;
+#else
mLLPluginDir = mExecutableDir + mDirDelimiter + "llplugin";
+#endif
// *TODO: don't use /tmp, use $HOME/.secondlife/tmp or something.
mTempDir = "/tmp";