Merge branch 'gnuinstalldirs' into 'master'

use GNUInstallDirs by default

See merge request gmsh/gmsh!33

CMakeLists.txt

@@ -1623,10 +1623,11 @@ if(WIN32 OR CYGWIN)
     set(GMSH_DOC .)
     set(GMSH_MAN .)
   else(ENABLE_OS_SPECIFIC_INSTALL)
-    set(GMSH_BIN bin)
-    set(GMSH_LIB lib)
-    set(GMSH_DOC share/doc/gmsh)
-    set(GMSH_MAN share/man/man1)
+    include(GNUInstallDirs)
+    set(GMSH_BIN ${CMAKE_INSTALL_BINDIR})
+    set(GMSH_LIB ${CMAKE_INSTALL_LIBDIR})
+    set(GMSH_DOC ${CMAKE_INSTALL_DOCDIR})
+    set(GMSH_MAN ${CMAKE_INSTALL_MANDIR}/man1)
   endif(ENABLE_OS_SPECIFIC_INSTALL)
   if(CYGWIN)
     unix2dos(GMSH_API)

wrappers/java/CMakeLists.txt

@@ -69,6 +69,6 @@ POST_BUILD # do the rest of the command after the build period
   COMMAND ${CMAKE_COMMAND} -E copy
     ${CMAKE_CURRENT_SOURCE_DIR}/WrappingJava/build.xml
     ${CMAKE_CURRENT_BINARY_DIR}/WrappingJava/)
-install(TARGETS WrapGmsh DESTINATION lib OPTIONAL)
+install(TARGETS WrapGmsh DESTINATION ${GMSH_LIB} OPTIONAL)
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/WrappingJava/WrapGmsh.jar
-        DESTINATION lib)
+    DESTINATION ${GMSH_LIB})