diff --git a/autobuild.xml b/autobuild.xml
index 9f3a56a688..dd8efe8058 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -3282,9 +3282,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors
archive
name
linux64
diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake
index 519f68b53e..00ca8ee473 100644
--- a/indra/cmake/Copy3rdPartyLibs.cmake
+++ b/indra/cmake/Copy3rdPartyLibs.cmake
@@ -223,7 +223,7 @@ elseif(LINUX)
set(SHARED_LIB_STAGING_DIR_RELWITHDEBINFO "${SHARED_LIB_STAGING_DIR}")
set(SHARED_LIB_STAGING_DIR_RELEASE "${SHARED_LIB_STAGING_DIR}")
- set(vivox_lib_dir "${ARCH_PREBUILT_DIRS_RELEASE}")
+ set(vivox_lib_dir "${ARCH_PREBUILT_DIRS_RELEASE}/../../lib32/")
set(vivox_libs
libsndfile.so.1
libortp.so
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index da2328c404..7f641ee53e 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -2042,19 +2042,14 @@ class LinuxManifest(ViewerManifest):
# Vivox runtimes
# Currentelly, the 32-bit ones will work with a 64-bit client.
- with self.prefix(src=os.path.join(pkgdir, 'lib', 'release'), dst="bin"):
+ with self.prefix(src=os.path.join(pkgdir, 'bin32' ), dst="bin"):
self.path("SLVoice")
+ with self.prefix(src=os.path.join(pkgdir ), dst="bin"):
self.path("win32")
self.path("win64")
- with self.prefix(src=os.path.join(pkgdir, 'lib', 'release'), dst="lib"):
- self.path("libortp.so")
- self.path("libsndfile.so.1")
- # Vivox wants this library even if it's present already in the viewer
- self.path("libvivoxoal.so.1")
- self.path("libvivoxsdk.so")
- self.path("libvivoxplatform.so")
-
+ with self.prefix(src=os.path.join(pkgdir, 'lib32' ), dst="lib32"):
+ self.path("*")
def package_finish(self):
# a standard map of strings for replacing in the templates