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

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

Author: trophime-guest
Date: Mon May  6 07:00:08 2013
New Revision: 45836

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=45836
Log:
update patches for rev >= 15441

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=45836&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/fix_libdir.patch (original)
+++ packages/gmsh-tetgen/trunk/debian/patches/fix_libdir.patch Mon May  6 07:00:08 2013
@@ -4,7 +4,7 @@
 
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -1208,10 +1208,10 @@
+@@ -1255,13 +1255,13 @@
  # (e.g. "make lib" or "make shared" followed by "make install/fast")
  install(TARGETS gmsh DESTINATION ${GMSH_BIN} OPTIONAL)
  if(ENABLE_BUILD_LIB)
@@ -15,8 +15,12 @@
 -  install(TARGETS shared DESTINATION lib OPTIONAL)
 +  install(TARGETS shared DESTINATION ${INSTALL_LIB_DIR} OPTIONAL)
  endif(ENABLE_BUILD_SHARED)
+ if(ENABLE_BUILD_ANDROID)
+-  install(TARGETS androidGmsh DESTINATION lib OPTIONAL)
++  install(TARGETS androidGmsh DESTINATION ${INSTALL_LIB_DIR} OPTIONAL)
+ endif(ENABLE_BUILD_ANDROID)
+ 
  install(FILES ${GMSH_API} DESTINATION include/gmsh)
- install(FILES ${WELCOME_FILE} DESTINATION ${GMSH_DOC} RENAME README.txt)
 --- a/wrappers/java/CMakeLists.txt
 +++ b/wrappers/java/CMakeLists.txt
 @@ -73,6 +73,6 @@