--- CMakeGlobals.txt	2011-07-11 11:07:23.000000000 -0700
+++ CMakeGlobals.txt.fixed	2011-08-21 11:10:40.000000000 -0700
@@ -98,7 +98,7 @@
    else()
      set(RSTUDIO_INSTALL_BIN bin)
    endif()
-   set(RSTUDIO_INSTALL_SUPPORTING .)
+   set(RSTUDIO_INSTALL_SUPPORTING ./share/rstudio-0.94.92/)
 endif()
 
 # if the install prefix is /usr/local then tweak as appropriate
--- src/cpp/server/CMakeLists.txt	2011-07-11 11:07:23.000000000 -0700
+++ src/cpp/server/CMakeLists.txt.fixed	 2011-08-21 11:10:40.000000000 -0700
@@ -150,7 +150,7 @@
    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_INITD_DEBIAN_SCRIPT}.in
                   ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_DEBIAN_SCRIPT})
    install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_DEBIAN_SCRIPT}
-           DESTINATION ${RSERVER_INITD_DEBIAN_DIR})
+           DESTINATION share/rstudio-0.94.92/${RSERVER_INITD_DEBIAN_DIR})
 
    # install configured redhat init.d script
    set(RSERVER_INITD_REDHAT_DIR "extras/init.d/redhat")
@@ -158,7 +158,7 @@
    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_INITD_REDHAT_SCRIPT}.in
                   ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_REDHAT_SCRIPT})
    install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_REDHAT_SCRIPT}
-           DESTINATION ${RSERVER_INITD_REDHAT_DIR})
+           DESTINATION share/rstudio-0.94.92/${RSERVER_INITD_REDHAT_DIR})
 
    # install configured suse init.d script
    set(RSERVER_INITD_SUSE_DIR "extras/init.d/suse")
@@ -166,13 +166,13 @@
    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_INITD_SUSE_SCRIPT}.in
                   ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_SUSE_SCRIPT})
    install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_SUSE_SCRIPT}
-           DESTINATION ${RSERVER_INITD_SUSE_DIR})
+           DESTINATION share/rstudio-0.94.92/${RSERVER_INITD_SUSE_DIR})
 
    # install pam profile
    set(RSERVER_PAM_DIR "extras/pam")
    set(RSERVER_PAM_PROFILE "${RSERVER_PAM_DIR}/rstudio")
    install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_PAM_PROFILE}
-           DESTINATION ${RSERVER_PAM_DIR})
+           DESTINATION share/rstudio-0.94.92/${RSERVER_PAM_DIR})
 
    # install configured apparmor profile
    set(RSERVER_APPARMOR_DIR "extras/apparmor")
@@ -180,9 +180,9 @@
    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_APPARMOR_PROFILE}.in
                   ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_APPARMOR_PROFILE})
    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_APPARMOR_PROFILE}
-           DESTINATION ${RSERVER_APPARMOR_DIR})
+           DESTINATION share/rstudio-0.94.92/${RSERVER_APPARMOR_DIR})
    install(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_APPARMOR_DIR}/apparmor-profile-load
-           DESTINATION ${RSERVER_APPARMOR_DIR})
+           DESTINATION share/rstudio-0.94.92/${RSERVER_APPARMOR_DIR})
 
    # install configured upstart profile
    set(RSERVER_UPSTART_DIR "extras/upstart")
@@ -190,6 +190,6 @@
    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_UPSTART_PROFILE}.in
                   ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_UPSTART_PROFILE})
    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_UPSTART_PROFILE}
-           DESTINATION ${RSERVER_UPSTART_DIR})
+           DESTINATION share/rstudio-0.94.92/${RSERVER_UPSTART_DIR})
 
 endif()
--- src/cpp/server/ServerOptions.cpp	2011-07-11 11:07:23.000000000 -0700
+++ src/cpp/server/ServerOptions.cpp.fixed	2011-08-21 11:10:40.000000000 -0700
@@ -206,7 +206,7 @@
 
    // convert relative paths by completing from the system installation
    // path (this allows us to be relocatable)
-   resolvePath(installPath, &wwwLocalPath_);
+   resolvePath(installPath.childPath("share/rstudio-0.94.92"), &wwwLocalPath_);
    resolvePath(installPath, &authPamHelperPath_);
    resolvePath(installPath, &rsessionPath_);
    resolvePath(installPath, &rldpathPath_);
--- src/cpp/session/SessionOptions.cpp	2011-07-11 11:07:23.000000000 -0700
+++ src/cpp/session/SessionOptions.cpp.fixed	2011-08-21 11:10:40.000000000 -0700
@@ -272,12 +272,12 @@
    }
 
    // convert relative paths by completing from the app resource path
-   resolvePath(resourcePath, &rHelpCssFilePath_);
+   resolvePath(resourcePath.childPath("share/rstudio-0.94.92"), &rHelpCssFilePath_);
    resolvePath(resourcePath, &agreementFilePath_);
-   resolvePath(resourcePath, &wwwLocalPath_);
-   resolvePath(resourcePath, &coreRSourcePath_);
-   resolvePath(resourcePath, &modulesRSourcePath_);
-   resolvePath(resourcePath, &sessionPackagesPath_);
+   resolvePath(resourcePath.childPath("share/rstudio-0.94.92"), &wwwLocalPath_);
+   resolvePath(resourcePath.childPath("share/rstudio-0.94.92"), &coreRSourcePath_);
+   resolvePath(resourcePath.childPath("share/rstudio-0.94.92"), &modulesRSourcePath_);
+   resolvePath(resourcePath.childPath("share/rstudio-0.94.92"), &sessionPackagesPath_);
    resolvePath(resourcePath, &rpostbackPath_);
 
    // shared secret with parent