r45859 - /packages/gmsh-tetgen/trunk/debian/patches/fix_libdir.patch

[trophime-guest at users.alioth.debian.org]

Author: trophime-guest
Date: Mon May 13 13:41:07 2013
New Revision: 45859

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=45859
Log:
fix patch for 2.7.2

Modified:
    packages/gmsh-tetgen/trunk/debian/patches/fix_libdir.patch

Modified: packages/gmsh-tetgen/trunk/debian/patches/fix_libdir.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/patches/fix_libdir.patch?rev=45859&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/fix_libdir.patch (original)
+++ packages/gmsh-tetgen/trunk/debian/patches/fix_libdir.patch Mon May 13 13:41:07 2013
@@ -2,8 +2,10 @@
 Author: Anton Gladky <gladk at debian.org>
 Last-Update: 2013-03-15
 
---- a/wrappers/java/CMakeLists.txt
-+++ b/wrappers/java/CMakeLists.txt
+Index: gmsh-tetgen-2.7.1~svn15527/wrappers/java/CMakeLists.txt
+===================================================================
+--- gmsh-tetgen-2.7.1~svn15527.orig/wrappers/java/CMakeLists.txt	2013-05-13 14:36:11.000000000 +0200
++++ gmsh-tetgen-2.7.1~svn15527/wrappers/java/CMakeLists.txt	2013-05-13 14:36:11.000000000 +0200
 @@ -73,6 +73,6 @@
    COMMAND ${CMAKE_COMMAND} -E copy 
      ${CMAKE_CURRENT_SOURCE_DIR}/WrappingJava/build.xml 
@@ -13,3 +15,20 @@
  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/WrappingJava/WrapGmsh.jar 
 -        DESTINATION lib)
 +  DESTINATION ${INSTALL_LIB_DIR})
+Index: gmsh-tetgen-2.7.1~svn15527/CMakeLists.txt
+===================================================================
+--- gmsh-tetgen-2.7.1~svn15527.orig/CMakeLists.txt	2013-05-13 14:36:11.000000000 +0200
++++ gmsh-tetgen-2.7.1~svn15527/CMakeLists.txt	2013-05-13 14:36:41.000000000 +0200
+@@ -1294,10 +1294,10 @@
+ # (e.g. "make lib" or "make shared" followed by "make install/fast")
+ install(TARGETS gmsh DESTINATION ${GMSH_BIN} OPTIONAL)
+ if(ENABLE_BUILD_LIB)
+-  install(TARGETS lib DESTINATION ${GMSH_LIB} OPTIONAL)
++  install(TARGETS lib DESTINATION ${INSTALL_LIB_DIR} OPTIONAL)
+ endif(ENABLE_BUILD_LIB)
+ if(ENABLE_BUILD_SHARED OR ENABLE_BUILD_DYNAMIC)
+-  install(TARGETS shared DESTINATION ${GMSH_LIB} OPTIONAL)
++  install(TARGETS shared DESTINATION ${INSTALL_LIB_DIR} OPTIONAL)
+ endif(ENABLE_BUILD_SHARED OR ENABLE_BUILD_DYNAMIC)
+ 
+ install(FILES ${ONELAB_PY} DESTINATION ${GMSH_BIN})