2 files changed, 14 insertions, 14 deletions
diff --git a/indra/cmake/LibraryInstall.cmake b/indra/cmake/LibraryInstall.cmake
index e98d71f044..1289ce02af 100644
--- a/indra/cmake/LibraryInstall.cmake
+++ b/indra/cmake/LibraryInstall.cmake
@@ -1,13 +1,13 @@
 list(REMOVE_ITEM ${PROJECT_NAME}_HEADER_FILES CMakeLists.txt)
 #install(FILES ${${PROJECT_NAME}_HEADER_FILES}
-#	DESTINATION include/${PROJECT_NAME})
+#        DESTINATION include/${PROJECT_NAME})
 if (BUILD_SHARED_LIBS)
-	if (EXISTS ${CMAKE_SYSROOT}/usr/lib/${ARCH}-linux-gnu)
-		set(_LIB lib/${ARCH}-linux-gnu)
-	elseif (EXISTS /lib64 AND NOT ${LINUX_DISTRO} MATCHES arch)
-		set(_LIB lib64)
-	else ()
-		set(_LIB lib)
-	endif ()
-	install(TARGETS ${PROJECT_NAME} DESTINATION ${_LIB})
+        if (${LINUX_DISTRO} MATCHES debian OR (${LINUX_DISTRO} MATCHES ubuntu))
+                set(_LIB lib/${ARCH}-linux-gnu)
+        elseif (${LINUX_DISTRO} MATCHES fedora OR (${LINUX_DISTRO} MATCHES opensuse-tumbleweed))
+                set(_LIB lib${ADDRESS_SIZE})
+        else ()
+                set(_LIB lib)
+        endif ()
+        install(TARGETS ${PROJECT_NAME} DESTINATION ${_LIB})
 endif ()
diff --git a/indra/cmake/UnixInstall.cmake b/indra/cmake/UnixInstall.cmake
index c925376e63..48d84dc062 100644
--- a/indra/cmake/UnixInstall.cmake
+++ b/indra/cmake/UnixInstall.cmake
@@ -14,13 +14,13 @@ if (INSTALL)
       "Top-level installation directory.")
   endif (CMAKE_SYSTEM_NAME MATCHES FreeBSD)
 
-  if (EXISTS ${CMAKE_SYSROOT}/usr/lib/${ARCH}-linux-gnu)
+  if (${LINUX_DISTRO} MATCHES debian OR (${LINUX_DISTRO} MATCHES ubuntu))
     set(_LIB lib/${ARCH}-linux-gnu)
-  elseif (EXISTS /lib64 AND NOT ${LINUX_DISTRO} MATCHES arch)
-    set(_LIB lib64)
-  else (EXISTS ${CMAKE_SYSROOT}/usr/lib/${ARCH}-linux-gnu)
+  elseif (${LINUX_DISTRO} MATCHES fedora OR (${LINUX_DISTRO} MATCHES opensuse-tumbleweed))
+    set(_LIB lib${ADDRESS_SIZE})
+  else ()
     set(_LIB lib)
-  endif (EXISTS ${CMAKE_SYSROOT}/usr/lib/${ARCH}-linux-gnu)
+  endif ()
 
   set(INSTALL_LIBRARY_DIR ${INSTALL_PREFIX}/${_LIB} CACHE PATH
       "Installation directory for read-only shared files.")