File slviewer-1.21.6.0-fix_install.patch of Package slviewer-beta

Overview Repositories Revisions Requests Users Attributes Meta

File slviewer-1.21.6.0-fix_install.patch of Package slviewer-beta

--- linden/indra/newview/ViewerInstall.cmake	2008-10-25 15:09:06.104903789 +0200
+++ linden/indra/newview/ViewerInstall.cmake.new	2008-10-25 15:04:45.000000000 +0200
@@ -1,9 +1,9 @@
 install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/secondlife-bin
-        DESTINATION ${APP_BINARY_DIR}
+        DESTINATION ${INSTALL_BINARY_DIR} RENAME ${APP_BINARY_NAME}
         )
 
 install(DIRECTORY skins app_settings linux_tools
-        DESTINATION ${APP_SHARE_DIR}
+        DESTINATION ${INSTALL_SHARE_DIR}
         PATTERN ".svn" EXCLUDE
         )
 
@@ -11,8 +11,8 @@
           PATHS ${VIEWER_DIR}/newview/character)
 
 if (IS_ARTWORK_PRESENT)
-  install(DIRECTORY res res-sdl character
-          DESTINATION ${APP_SHARE_DIR}
+  install(DIRECTORY res-sdl character
+          DESTINATION ${INSTALL_SHARE_DIR}
           PATTERN ".svn" EXCLUDE
           )
 else (IS_ARTWORK_PRESENT)
@@ -20,9 +20,9 @@
 endif (IS_ARTWORK_PRESENT)
 
 install(FILES featuretable_linux.txt featuretable_solaris.txt gpu_table.txt
-        DESTINATION ${APP_SHARE_DIR}
+        DESTINATION ${INSTALL_SHARE_DIR}
         )
 
 install(FILES ${SCRIPTS_DIR}/messages/message_template.msg
-        DESTINATION ${APP_SHARE_DIR}/app_settings
+        DESTINATION ${INSTALL_SHARE_DIR}/app_settings
         )
--- linden/indra/cmake/UnixInstall.cmake.orig	2008-10-25 15:16:57.000000000 +0200
+++ linden/indra/cmake/UnixInstall.cmake	2008-10-25 15:19:37.008991619 +0200
@@ -15,17 +15,14 @@
     set(_LIB lib)
   endif (EXISTS /lib64)
 
-  set(INSTALL_LIBRARY_DIR ${INSTALL_PREFIX}/${_LIB} CACHE PATH
+  set(INSTALL_LIBRARY_DIR ${INSTALL_PREFIX}/${APP_LIBRARY_DIR} CACHE PATH
       "Installation directory for read-only shared files.")
 
-  set(INSTALL_SHARE_DIR ${INSTALL_PREFIX}/share CACHE PATH
+  set(INSTALL_SHARE_DIR ${INSTALL_PREFIX}/${APP_SHARE_DIR} CACHE PATH
       "Installation directory for read-only shared files.")
 
-  set(APP_BINARY_DIR ${INSTALL_LIBRARY_DIR}/secondlife-${viewer_VERSION}
+  set(INSTALL_BINARY_DIR ${INSTALL_PREFIX}/${APP_BINARY_DIR}
       CACHE PATH
       "Installation directory for binaries.")
 
-  set(APP_SHARE_DIR ${INSTALL_SHARE_DIR}/secondlife-${viewer_VERSION}
-      CACHE PATH
-      "Installation directory for read-only data files.")
 endif (INSTALL)

Places

File slviewer-1.21.6.0-fix_install.patch of Package slviewer-beta

Places