From 4e732b9860130f1736baac33a9d868a0a76fab75 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Mon, 8 Sep 2014 11:22:40 +1000
Subject: [PATCH] Fix building as Python module (manpage-generation)

---
 .../python/mathutils/mathutils_Matrix.c       |  8 ++---
 source/creator/CMakeLists.txt                 | 34 ++++++++++++-------
 2 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/source/blender/python/mathutils/mathutils_Matrix.c b/source/blender/python/mathutils/mathutils_Matrix.c
index 675234fe3e4..282f29b4934 100644
--- a/source/blender/python/mathutils/mathutils_Matrix.c
+++ b/source/blender/python/mathutils/mathutils_Matrix.c
@@ -1560,10 +1560,10 @@ static PyObject *Matrix_adjugate(MatrixObject *self)
 		adjoint_matrix_n(self->matrix, self->matrix, self->num_col);
 	}
 	else {
-			PyErr_Format(PyExc_ValueError,
-			             "Matrix adjugate(d): size (%d) unsupported",
-			             (int)self->num_col);
-			return NULL;
+		PyErr_Format(PyExc_ValueError,
+		             "Matrix adjugate(d): size (%d) unsupported",
+		             (int)self->num_col);
+		return NULL;
 	}
 
 
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index b32aa464d67..6ed87f6596c 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -391,18 +391,25 @@ endif()
 
 if(UNIX AND NOT APPLE)
 
-	install(
-		CODE
-		"
-		execute_process(COMMAND
-		                ${CMAKE_SOURCE_DIR}/doc/manpage/blender.1.py
-		                ${TARGETDIR}/blender
-		                ${TARGETDIR}/blender.1)
-		"
-	)
+	if(NOT WITH_PYTHON_MODULE)
+		install(
+			CODE
+			"
+			execute_process(COMMAND
+							${CMAKE_SOURCE_DIR}/doc/manpage/blender.1.py
+							${TARGETDIR}/blender
+							${TARGETDIR}/blender.1)
+			"
+		)
+	endif()
 
 	# there are a few differences between portable and system install
 	if(WITH_INSTALL_PORTABLE)
+		install(
+			FILES ${TARGETDIR}/blender.1
+			DESTINATION ${TARGETDIR}
+		)
+
 		install(
 			FILES
 				${CMAKE_SOURCE_DIR}/release/freedesktop/blender.desktop
@@ -434,6 +441,11 @@ if(UNIX AND NOT APPLE)
 				PROGRAMS ${TARGETDIR}/blender
 				DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
 			)
+			# manpage only with 'blender' binary
+			install(
+				FILES ${TARGETDIR}/blender.1
+				DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man1
+			)
 		endif()
 
 
@@ -468,10 +480,6 @@ if(UNIX AND NOT APPLE)
 			PROGRAMS ${CMAKE_SOURCE_DIR}/release/bin/blender-thumbnailer.py
 			DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
 		)
-		install(
-			FILES ${TARGETDIR}/blender.1
-			DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man1
-		)
 		install(
 			FILES ${BLENDER_TEXT_FILES}
 			DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/blender