From ee9bedca0eafa468641c8150c7e1bec6cf548ffe Mon Sep 17 00:00:00 2001 From: Dimitrios Eftaxiopoulos Date: Wed, 12 Sep 2012 23:51:24 +0300 Subject: [PATCH] Reapply patch for lang/CMakeLists.txt --- debian/patches/lang-CMakeLists-txt.patch | 11 +++++++++++ debian/patches/series | 1 + lang/CMakeLists.txt | 2 +- 3 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 debian/patches/lang-CMakeLists-txt.patch diff --git a/debian/patches/lang-CMakeLists-txt.patch b/debian/patches/lang-CMakeLists-txt.patch new file mode 100644 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 e84cfd6..69d2b5d 100644 --- 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 cfdc3a7..bec7d4b 100644 --- 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) -- 2.30.2