Reapply patch for lang/CMakeLists.txt

diff --git a/debian/patches/lang-CMakeLists-txt.patch b/debian/patches/lang-CMakeLists-txt.patch
new file mode 100644 (file)
index 0000000..8c9e7a5
--- /dev/null
+++ b/debian/patches/lang-CMakeLists-txt.patch
@@ -0,0 +1,11 @@
+--- a/lang/CMakeLists.txt
++++ b/lang/CMakeLists.txt
+@@ -43,7 +43,7 @@
+               WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/lang
+       )
+       add_custom_target(mgl_python_module ALL DEPENDS _mathgl.so mathgl.py)
+-      install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_BINARY_DIR}/lang/setup.py install --prefix=${CMAKE_INSTALL_PREFIX} WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/lang )")
++      install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_BINARY_DIR}/lang/setup.py install --prefix=${CMAKE_SOURCE_DIR}/debian/tmp/usr --install-layout=deb WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/lang )")
+       set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "mgl_wrap.cpp;build;mathgl.pyc")
+ endif(MGL_HAVE_PYTHON)
+ 

diff --git a/debian/patches/series b/debian/patches/series
index e84cfd696073e6a587096f92565ea4ee5a65ff6a..69d2b5dd9bcb3a1dfd59c88265bc8b6a0afd369e 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
+lang-CMakeLists-txt.patch
 CMakeLists-txt.patch
 lang-setup-py-in.patch

diff --git a/lang/CMakeLists.txt b/lang/CMakeLists.txt
index cfdc3a7f0dc5ce12985708f843711a6464f00ffb..bec7d4b515118217a215d69c35be4fe0e90f824a 100644 (file)
--- a/lang/CMakeLists.txt
+++ b/lang/CMakeLists.txt
@@ -43,7 +43,7 @@ if(MGL_HAVE_PYTHON)
                WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/lang
        )
        add_custom_target(mgl_python_module ALL DEPENDS _mathgl.so mathgl.py)
-       install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_BINARY_DIR}/lang/setup.py install --prefix=${CMAKE_INSTALL_PREFIX} WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/lang )")
+       install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_BINARY_DIR}/lang/setup.py install --prefix=${CMAKE_SOURCE_DIR}/debian/tmp/usr --install-layout=deb WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/lang )")
        set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "mgl_wrap.cpp;build;mathgl.pyc")
 endif(MGL_HAVE_PYTHON)