Install mathgl.oct in libmgl-data package

diff --git a/debian/patches/lang.patch b/debian/patches/lang.patch
new file mode 100644 (file)
index 0000000..960df3e
--- /dev/null
+++ b/debian/patches/lang.patch
@@ -0,0 +1,21 @@
+--- a/lang/CMakeLists.txt
++++ b/lang/CMakeLists.txt
+@@ -123,11 +123,13 @@
+       add_custom_target(mgl_octave_module ALL DEPENDS mathgl.tar.gz)
+ 
+       install(FILES ${CMAKE_BINARY_DIR}/lang/mathgl.tar.gz DESTINATION ${MGL_DATA_PATH})
+-      if(enable-octave-install)
+-              install(CODE "execute_process(
+-                      COMMAND ${oct_exec} -q --eval \"pkg install mathgl.tar.gz\"
+-                      WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/lang )")
+-      endif(enable-octave-install)
++      install(FILES ${CMAKE_BINARY_DIR}/lang/mathgl.oct DESTINATION ${MGL_DATA_PATH})
++#     if(enable-octave-install)
++#             install(CODE "execute_process(
++#                     COMMAND ${oct_exec} -q --eval \"pkg prefix ${MathGL_SOURCE_DIR}/debian/tmp/usr/share/mathgl\"
++#                     COMMAND ${oct_exec} -q --eval \"pkg install mathgl.tar.gz\"
++#                     WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/lang )")
++#     endif(enable-octave-install)
+       set(mgl_clean_files ${mgl_clean_files} mathgl)
+ endif(enable-octave)
+ set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${mgl_clean_files}")

diff --git a/debian/patches/series b/debian/patches/series
index e20e679db513083008c22885584f3c6193528ecd..3a8f9d73890df2f72c06f4a98e148ad2ba0a3d47 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
+lang.patch
 widgets.patch
 CMakeLists.patch

diff --git a/lang/CMakeLists.txt b/lang/CMakeLists.txt
index 68ec1179b9023b9b9bddb78bc57e557915f52651..14261558d32f3523f3a0d79d80d83fa31530ea8b 100644 (file)
--- a/lang/CMakeLists.txt
+++ b/lang/CMakeLists.txt
@@ -123,11 +123,13 @@ message(STATUS "${oct_prog} ${oct_host} ${oct_api}")
        add_custom_target(mgl_octave_module ALL DEPENDS mathgl.tar.gz)
 
        install(FILES ${CMAKE_BINARY_DIR}/lang/mathgl.tar.gz DESTINATION ${MGL_DATA_PATH})
-       if(enable-octave-install)
-               install(CODE "execute_process(
-                       COMMAND ${oct_exec} -q --eval \"pkg install mathgl.tar.gz\"
-                       WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/lang )")
-       endif(enable-octave-install)
+       install(FILES ${CMAKE_BINARY_DIR}/lang/mathgl.oct DESTINATION ${MGL_DATA_PATH})
+#      if(enable-octave-install)
+#              install(CODE "execute_process(
+#                      COMMAND ${oct_exec} -q --eval \"pkg prefix ${MathGL_SOURCE_DIR}/debian/tmp/usr/share/mathgl\"
+#                      COMMAND ${oct_exec} -q --eval \"pkg install mathgl.tar.gz\"
+#                      WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/lang )")
+#      endif(enable-octave-install)
        set(mgl_clean_files ${mgl_clean_files} mathgl)
 endif(enable-octave)
 set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${mgl_clean_files}")