Move libexec binaries to /usr/lib/megapahit on Arch

as in Arch, there's really no /usr/libexec.

4 files changed, 37 insertions, 13 deletions

diff --git a/indra/cmake/UnixInstall.cmake b/indra/cmake/UnixInstall.cmake
index 0751e1caa5..c925376e63 100644
--- a/indra/cmake/UnixInstall.cmake
+++ b/indra/cmake/UnixInstall.cmake
@@ -35,7 +35,13 @@ if (INSTALL)
   set(APP_SHARE_DIR ${INSTALL_SHARE_DIR}/${VIEWER_BINARY_NAME}
       CACHE PATH
       "Installation directory for read-only data files.")
-  set(APP_LIBEXEC_DIR ${INSTALL_PREFIX}/libexec/${VIEWER_BINARY_NAME}
-      CACHE PATH
-      "Installation directory for non-manual executables.")
+  if (${LINUX_DISTRO} MATCHES arch)
+    set(APP_LIBEXEC_DIR ${INSTALL_PREFIX}/lib/${VIEWER_BINARY_NAME}
+        CACHE PATH
+        "Installation directory for non-manual executables.")
+  else (${LINUX_DISTRO} MATCHES arch)
+    set(APP_LIBEXEC_DIR ${INSTALL_PREFIX}/libexec/${VIEWER_BINARY_NAME}
+        CACHE PATH
+        "Installation directory for non-manual executables.")
+  endif (${LINUX_DISTRO} MATCHES arch)
 endif (INSTALL)
diff --git a/indra/llplugin/slplugin/CMakeLists.txt b/indra/llplugin/slplugin/CMakeLists.txt
index 3ad6d10336..d29731894f 100644
--- a/indra/llplugin/slplugin/CMakeLists.txt
+++ b/indra/llplugin/slplugin/CMakeLists.txt
@@ -68,6 +68,8 @@ endif ()
 if (INSTALL)
   if (DARWIN)
     install(TARGETS ${PROJECT_NAME} DESTINATION .)
+  elseif (${LINUX_DISTRO} MATCHES arch)
+    install(TARGETS ${PROJECT_NAME} DESTINATION lib/${VIEWER_BINARY_NAME})
   else (DARWIN)
     install(TARGETS ${PROJECT_NAME} DESTINATION libexec/${VIEWER_BINARY_NAME})
   endif (DARWIN)
diff --git a/indra/media_plugins/cef/CMakeLists.txt b/indra/media_plugins/cef/CMakeLists.txt
index 4ca43e06b7..3799fa41ac 100644
--- a/indra/media_plugins/cef/CMakeLists.txt
+++ b/indra/media_plugins/cef/CMakeLists.txt
@@ -150,13 +150,23 @@ if (INSTALL)
         else (EXISTS ${CMAKE_SYSROOT}/usr/lib/${ARCH}-linux-gnu)
             set(_LIB lib)
         endif (EXISTS ${CMAKE_SYSROOT}/usr/lib/${ARCH}-linux-gnu)
-        install(
-            PROGRAMS
-                ${AUTOBUILD_INSTALL_DIR}/bin/release/chrome-sandbox
-                ${AUTOBUILD_INSTALL_DIR}/bin/release/dullahan_host
-            DESTINATION libexec/${VIEWER_BINARY_NAME}
-            #PERMISSIONS SETUID OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
-        )
+        if (${LINUX_DISTRO} MATCHES arch)
+            install(
+                PROGRAMS
+                    ${AUTOBUILD_INSTALL_DIR}/bin/release/chrome-sandbox
+                    ${AUTOBUILD_INSTALL_DIR}/bin/release/dullahan_host
+                DESTINATION lib/${VIEWER_BINARY_NAME}
+                #PERMISSIONS SETUID OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
+            )
+        else (${LINUX_DISTRO} MATCHES arch)
+            install(
+                PROGRAMS
+                    ${AUTOBUILD_INSTALL_DIR}/bin/release/chrome-sandbox
+                    ${AUTOBUILD_INSTALL_DIR}/bin/release/dullahan_host
+                DESTINATION libexec/${VIEWER_BINARY_NAME}
+                #PERMISSIONS SETUID OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
+            )
+        endif (${LINUX_DISTRO} MATCHES arch)
         install(
             FILES
                 ${AUTOBUILD_INSTALL_DIR}/lib/release/libcef.so
diff --git a/indra/newview/ViewerInstall.cmake b/indra/newview/ViewerInstall.cmake
index 557cfe7021..7fb2f6a6fa 100644
--- a/indra/newview/ViewerInstall.cmake
+++ b/indra/newview/ViewerInstall.cmake
@@ -90,9 +90,15 @@ install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${VIEWER_BINARY_NAME}
         DESTINATION bin
         )
 
-install(PROGRAMS linux_tools/launch_url.sh
-        DESTINATION libexec/${VIEWER_BINARY_NAME}
-        )
+if (${LINUX_DISTRO} MATCHES arch)
+     install(PROGRAMS linux_tools/launch_url.sh
+          DESTINATION lib/${VIEWER_BINARY_NAME}
+          )
+else (${LINUX_DISTRO} MATCHES arch)
+    install(PROGRAMS linux_tools/launch_url.sh
+          DESTINATION libexec/${VIEWER_BINARY_NAME}
+          )
+endif (${LINUX_DISTRO} MATCHES arch)
 
 if (LINUX)
         if (EXISTS ${CMAKE_SYSROOT}/usr/lib/${ARCH}-linux-gnu)