--- CMakeLists.txt.orig	2019-08-31 15:49:01 UTC
+++ CMakeLists.txt
@@ -356,9 +356,7 @@ endif ()
 if (USE_FIND_PACKAGE_FOR_EXR)
     include_directories (
         ${IMATH_INCLUDE_DIRS}
-        ${IMATH_INCLUDE_DIRS}/OpenEXR/
         ${OPENEXR_INCLUDE_DIRS}
-        ${OPENEXR_INCLUDE_DIRS}/OpenEXR/
     )
 else ()
     include_directories (
@@ -681,8 +679,8 @@ if (WITH_PYTHON2_BINDINGS OR WITH_PYTHON3_BINDINGS)
 endif ()
 
 if (WITH_STUDIO)
-    if (NOT WITH_PYTHON2_BINDINGS)
-        message (FATAL_ERROR "Option WITH_PYTHON2_BINDINGS should be \"ON\" to build appleseed.studio.")
+    if (NOT WITH_PYTHON3_BINDINGS)
+        message (FATAL_ERROR "Option WITH_PYTHON3_BINDINGS should be \"ON\" to build appleseed.studio.")
     endif ()
     add_subdirectory (src/appleseed.studio)
 endif ()
@@ -732,15 +730,27 @@ install (
         sandbox/share
         sandbox/stylesheets
     DESTINATION .
+    PATTERN "cmake" EXCLUDE
 )
 
 install (
-    FILES
+    DIRECTORY
+        sandbox/share/cmake
+    DESTINATION ../share
+)
+
+install (
+    PROGRAMS
         scripts/cleanmany.py
         scripts/convertmany.py
         scripts/rendermanager.py
         scripts/rendermany.py
         scripts/rendernode.py
+    DESTINATION bin
+)
+
+install_relative_symlink (
+    ${CMAKE_INSTALL_PREFIX}
         ${OSL_COMPILER}
         ${OSL_QUERY_INFO}
         ${OSL_MAKETX}
@@ -754,11 +764,6 @@ install (
         sandbox/schemas/settings.xsd
         sandbox/schemas/project.xsd
     DESTINATION schemas
-)
-
-install (
-    CODE "FILE (MAKE_DIRECTORY ${CMAKE_INSTALL_PREFIX}/images)"
-    CODE "FILE (MAKE_DIRECTORY ${CMAKE_INSTALL_PREFIX}/images/autosave)"
 )
 
 if (INSTALL_HEADERS)
