[gmsh] 06/11: add patch for using gnuinstalldirs

[Nico Schlömer]

This is an automated email from the git hooks/post-receive script.

nschloe-guest pushed a commit to branch master
in repository gmsh.

commit b80ccf12ca6f0dedc1d2eccf652cc1e344b8b478
Author: Nico Schlömer <nico.schloemer at gmail.com>
Date:   Mon Nov 6 17:31:14 2017 +0100

    add patch for using gnuinstalldirs
---
 debian/patches/40_gnuinstalldirs.patch | 32 ++++++++++++++++++++++++++++++++
 debian/patches/series                  |  1 +
 2 files changed, 33 insertions(+)

diff --git a/debian/patches/40_gnuinstalldirs.patch b/debian/patches/40_gnuinstalldirs.patch
new file mode 100644
index 0000000..9a7f4b4
--- /dev/null
+++ b/debian/patches/40_gnuinstalldirs.patch
@@ -0,0 +1,32 @@
+Description: Use GNUInstallDirs for proper install directories
+Author: Nico Schlömer <nico.schloemer at gmail.com>
+Last-Update: 2017-11-06
+
+index 326890f0d..6398392b8 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1687,10 +1687,11 @@ elseif(APPLE AND ENABLE_OS_SPECIFIC_INSTALL)
+   set(GMSH_DOC ../../..)
+   set(GMSH_MAN ../../..)
+ else(WIN32 OR CYGWIN)
+-  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(WIN32 OR CYGWIN)
+ 
+ # mark targets as optional so we can install them separately if needed
+@@ -1848,7 +1849,7 @@ if(GMSH_EXTRA_VERSION MATCHES "-git.*") # so that we'll overwrite the archives
+   set(CPACK_PACKAGE_FILE_NAME gmsh-git-${GMSH_OS})
+   set(CPACK_SOURCE_PACKAGE_FILE_NAME gmsh-git-source)
+ else(GMSH_EXTRA_VERSION MATCHES "-git.*")
+-  set(CPACK_PACKAGE_FILE_NAME gmsh-${GMSH_VERSION}-${GMSH_OS})      
++  set(CPACK_PACKAGE_FILE_NAME gmsh-${GMSH_VERSION}-${GMSH_OS})
+   set(CPACK_SOURCE_PACKAGE_FILE_NAME gmsh-${GMSH_VERSION}-source)
+ endif(GMSH_EXTRA_VERSION MATCHES "-git.*")
+ set(CPACK_PACKAGE_INSTALL_DIRECTORY "Gmsh")
diff --git a/debian/patches/series b/debian/patches/series
index d9ad349..87dc062 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,5 @@
 10_change_shared_library_name.patch
 20_skip_license_file.patch
 30_delete_gl2ps_from_source.patch
+40_gnuinstalldirs.patch
 140_drop_css.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/gmsh.git