From 46ae1138532baab4a38a2a638bf46b81f278aa14 Mon Sep 17 00:00:00 2001
From: John Haddon <thehaddonyoof@gmail.com>
Date: Tue, 8 Mar 2022 16:24:01 +0000
Subject: [PATCH] OpenColorIO : Fix location of PyOpenColorIO module

---
 OpenColorIO/config.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/OpenColorIO/config.py b/OpenColorIO/config.py
index ccd9d1fe97..1428a7bfb0 100644
--- a/OpenColorIO/config.py
+++ b/OpenColorIO/config.py
@@ -42,7 +42,9 @@
 		"cd build && make clean && make VERBOSE=1 -j {jobs} && make install",
 
 		"mkdir -p {buildDir}/python",
-		"{libCopyCommands}",
+		"mv {buildDir}/lib*/python*/site-packages/PyOpenColorIO* {buildDir}/python",
+
+		"{libCopyCommand}",
 
 		"mkdir -p {buildDir}/openColorIO",
 		"cp ../OpenColorIO-Configs-1.0_r2/nuke-default/config.ocio {buildDir}/openColorIO",
@@ -63,13 +65,12 @@
 
 		"variables" : {
 
-			"libCopyCommands" :
+			"libCopyCommand" :
 			# OpenColorIO's CMake setup uses GNUInstallDirs, which unhelpfully
 			# puts the libraries in `lib64`. Move them back. We'd like to do this
 			# in the build itself by passing `-D CMAKE_INSTALL_LIBDIR={buildDir}/lib`
 			# but that breaks OpenColorIO's internal libexpat setup.
-			"mv {buildDir}/lib*/libOpenColorIO* {buildDir}/lib;"
-			"mv {buildDir}/lib*/python*/site-packages/PyOpenColorIO* {buildDir}/python",
+			"mv {buildDir}/lib*/libOpenColorIO* {buildDir}/lib"
 
 		}
 
@@ -79,7 +80,7 @@
 
 		"variables" : {
 
-			"libCopyCommands" : "",
+			"libCopyCommand" : "",
 
 		}