| 1 | Replace "/usr/lib/librewolf" (the system-wide directory for extensions and
|
| 2 | native manifests) with "$ICECAT_SYSTEM_DIR".
|
| 3 |
|
| 4 | diff --git a/toolkit/xre/nsXREDirProvider.cpp b/toolkit/xre/nsXREDirProvider.cpp
|
| 5 | index 0cbc825738..5c0bf6ae7f 100644
|
| 6 | |
| 7 | |
| 8 | @@ -282,25 +282,10 @@
|
| 9 | nsCString aName = "LibreWolf"_ns) {
|
| 10 | nsresult rv;
|
| 11 | nsCOMPtr<nsIFile> localDir;
|
| 12 | -# if defined(XP_MACOSX)
|
| 13 | - rv = GetOSXFolderType(kOnSystemDisk, kApplicationSupportFolderType,
|
| 14 | - getter_AddRefs(localDir));
|
| 15 | - if (NS_SUCCEEDED(rv)) {
|
| 16 | - rv = localDir->AppendNative(aName);
|
| 17 | - }
|
| 18 | -# else
|
| 19 | - ToLowerCase(aName);
|
| 20 | - nsCString dirname =
|
| 21 | -# ifdef HAVE_USR_LIB64_DIR
|
| 22 | - "/usr/lib64/"_ns + aName
|
| 23 | -# elif defined(__OpenBSD__) || defined(__FreeBSD__)
|
| 24 | - "/usr/local/lib/"_ns + aName
|
| 25 | -# else
|
| 26 | - "/usr/lib/"_ns + aName
|
| 27 | -# endif
|
| 28 | - ;
|
| 29 | - rv = NS_NewNativeLocalFile(dirname, getter_AddRefs(localDir));
|
| 30 | -# endif
|
| 31 | + const char* systemParentDir = getenv("ICECAT_SYSTEM_DIR");
|
| 32 | + if (!systemParentDir || !*systemParentDir) return NS_ERROR_FAILURE;
|
| 33 | + rv = NS_NewNativeLocalFile(nsDependentCString(systemParentDir),
|
| 34 | + getter_AddRefs(localDir));
|
| 35 |
|
| 36 | if (NS_SUCCEEDED(rv)) {
|
| 37 | localDir.forget(aFile);
|