[oclgrind] 01/01: Move PCH files to subdirectory of library directory.

[James Price]

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

jprice-guest pushed a commit to branch master
in repository oclgrind.

commit 756a8ac078c14bc476d5b1f206111e0c4a5b7002
Author: James Price <j.price at bristol.ac.uk>
Date:   Tue Sep 8 20:08:08 2015 +0100

    Move PCH files to subdirectory of library directory.
---
 debian/liboclgrind-15.5.install   |  2 +-
 debian/patches/pch-location.patch | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/debian/liboclgrind-15.5.install b/debian/liboclgrind-15.5.install
index ee3011b..02fcb8b 100755
--- a/debian/liboclgrind-15.5.install
+++ b/debian/liboclgrind-15.5.install
@@ -1,3 +1,3 @@
 #!/usr/bin/dh-exec
 usr/lib/liboclgrind-15.5.so usr/lib/${DEB_HOST_MULTIARCH}/
-usr/share/oclgrind/15.5/*
+usr/lib/oclgrind/15.5/* usr/lib/${DEB_HOST_MULTIARCH}/oclgrind/15.5/
diff --git a/debian/patches/pch-location.patch b/debian/patches/pch-location.patch
index 39f90d0..bd590af 100644
--- a/debian/patches/pch-location.patch
+++ b/debian/patches/pch-location.patch
@@ -1,4 +1,4 @@
-Description: Move PCH files to /usr/share/oclgrind/<VERSION>/
+Description: Move PCH files to /usr/lib/*/oclgrind/<VERSION>/
  This allows multiple version of liboclgrind to co-exist.
 Author: James Price <j.price at bristol.ac.uk>
 Last-Update: 2015-08-07
@@ -19,7 +19,7 @@ Last-Update: 2015-08-07
 -  ${CORE_HEADERS} ${CMAKE_BINARY_DIR}/config.h ${CLC_HEADERS}
 -  DESTINATION include/oclgrind)
 +  ${CORE_HEADERS} ${CMAKE_BINARY_DIR}/config.h DESTINATION include/oclgrind)
-+install(FILES ${CLC_HEADERS} DESTINATION share/oclgrind/${Oclgrind_VERSION})
++install(FILES ${CLC_HEADERS} DESTINATION lib/oclgrind/${Oclgrind_VERSION})
  if ("${CMAKE_SYSTEM_NAME}" STREQUAL "Windows")
    install(FILES
      src/CL/cl.h
@@ -30,13 +30,13 @@ Last-Update: 2015-08-07
  #endif
          {
 -          const char *includes_relative = "/../include/oclgrind/";
-+          const char *share_relative = "/../share/oclgrind/"PACKAGE_VERSION"/";
++          const char *pch_relative = "/oclgrind/"PACKAGE_VERSION"/";
            size_t length = dirend - libpath;
 -          pchdir = new char[length + strlen(includes_relative) + 1];
-+          pchdir = new char[length + strlen(share_relative) + 1];
++          pchdir = new char[length + strlen(pch_relative) + 1];
            strncpy(pchdir, libpath, length);
 -          strcpy(pchdir + length, includes_relative);
-+          strcpy(pchdir + length, share_relative);
++          strcpy(pchdir + length, pch_relative);
          }
        }
      }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-opencl/oclgrind.git