[pocl] 07/10: use CMAKE_INSTALL_SYSCONFDIR for /etc

[Andreas Beckmann]

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

anbe pushed a commit to branch experimental
in repository pocl.

commit 0848cf785391113969f37dbf7a548688dd455908
Author: Andreas Beckmann <anbe at debian.org>
Date:   Tue Nov 28 05:33:39 2017 +0100

    use CMAKE_INSTALL_SYSCONFDIR for /etc
---
 debian/changelog                                        |  1 +
 debian/patches/cmake-use-CMAKE_INSTALL_SYSCONFDIR.patch | 14 ++++++++++++++
 debian/patches/series                                   |  1 +
 3 files changed, 16 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 0aa0937..28f296b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ pocl (0.14-1) UNRELEASED; urgency=medium
 
   * New upstream release.
   * Refresh/remove patches. The autotools based build system is gone.
+  * Use the CMAKE_INSTALL_SYSCONFDIR setting for /etc.
 
  -- Andreas Beckmann <anbe at debian.org>  Sun, 26 Nov 2017 22:29:33 +0100
 
diff --git a/debian/patches/cmake-use-CMAKE_INSTALL_SYSCONFDIR.patch b/debian/patches/cmake-use-CMAKE_INSTALL_SYSCONFDIR.patch
new file mode 100644
index 0000000..4076350
--- /dev/null
+++ b/debian/patches/cmake-use-CMAKE_INSTALL_SYSCONFDIR.patch
@@ -0,0 +1,14 @@
+Author: Andreas Beckmann <anbe at debian.org>
+Description: use CMAKE_INSTALL_SYSCONFDIR for /etc
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -134,7 +134,7 @@ set(POCL_INSTALL_PRIVATE_LIBDIR "${CMAKE
+ if(UNIX AND NOT CMAKE_CROSSCOMPILING AND CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
+   set(POCL_INSTALL_ICD_VENDORDIR "/etc/OpenCL/vendors" CACHE PATH "POCL ICD file destination")
+ else()
+-  set(POCL_INSTALL_ICD_VENDORDIR "${CMAKE_INSTALL_PREFIX}/etc/OpenCL/vendors" CACHE PATH "POCL ICD file destination")
++  set(POCL_INSTALL_ICD_VENDORDIR "${CMAKE_INSTALL_SYSCONFDIR}/OpenCL/vendors" CACHE PATH "POCL ICD file destination")
+ endif()
+ 
+ # for kernel-<target>.bc
diff --git a/debian/patches/series b/debian/patches/series
index 612fcaa..62ccd8c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@ consistent-newlines-in-POCL_ABORT.patch
 do-not-export-clang-symbols.patch
 cmake-no-fno-rtti.patch
 cmake-no-get_cpu_name.patch
+cmake-use-CMAKE_INSTALL_SYSCONFDIR.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/pocl.git