From: Tomasz Buchert <tomasz@debian.org>
Date: Fri, 21 Aug 2015 16:40:56 +0200
Subject: Fix upstream cmake files to support multi-arch.

---
 CMakeLists.txt                   | 4 ++++
 include/CMakeLists.txt           | 4 ++--
 lib/CMakeLists.txt               | 8 ++++----
 pkgconfig/CMakeLists.txt         | 4 ++--
 pkgconfig/libdivsufsort.pc.cmake | 4 ++--
 5 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7ceace3..d8d9113 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -84,6 +84,10 @@ endif(MSVC)
 ## Add definitions ##
 add_definitions(-DHAVE_CONFIG_H=1 -D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS)
 
+include(GNUInstallDirs)
+# set arch-specific include dir
+set(CMAKE_INSTALL_INCLUDEDIR "include/${CMAKE_LIBRARY_ARCHITECTURE}")
+
 ## Add subdirectories ##
 add_subdirectory(pkgconfig)
 add_subdirectory(include)
diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt
index 2532e56..3d98cce 100644
--- a/include/CMakeLists.txt
+++ b/include/CMakeLists.txt
@@ -151,12 +151,12 @@ set(SAINDEX_PRId "${SAINT32_PRId}")
 set(SAINT_PRId "${SAINT32_PRId}")
 configure_file("${CMAKE_CURRENT_SOURCE_DIR}/divsufsort.h.cmake"
                "${CMAKE_CURRENT_BINARY_DIR}/divsufsort.h" @ONLY)
-install(FILES "${CMAKE_CURRENT_BINARY_DIR}/divsufsort.h" DESTINATION include)
+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/divsufsort.h" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
 if(BUILD_DIVSUFSORT64)
   set(W64BIT "64")
   set(SAINDEX_TYPE "${SAINT64_TYPE}")
   set(SAINDEX_PRId "${SAINT64_PRId}")
   configure_file("${CMAKE_CURRENT_SOURCE_DIR}/divsufsort.h.cmake"
                  "${CMAKE_CURRENT_BINARY_DIR}/divsufsort64.h" @ONLY)
-  install(FILES "${CMAKE_CURRENT_BINARY_DIR}/divsufsort64.h" DESTINATION include)
+  install(FILES "${CMAKE_CURRENT_BINARY_DIR}/divsufsort64.h" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
 endif(BUILD_DIVSUFSORT64)
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 56e7942..b7fe13e 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -7,8 +7,8 @@ set(divsufsort_SRCS divsufsort.c sssort.c trsort.c utils.c)
 add_library(divsufsort ${divsufsort_SRCS})
 install(TARGETS divsufsort
   RUNTIME DESTINATION bin
-  LIBRARY DESTINATION lib
-  ARCHIVE DESTINATION lib)
+  LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+  ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}")
 set_target_properties(divsufsort PROPERTIES
   VERSION   "${LIBRARY_VERSION_FULL}"
   SOVERSION "${LIBRARY_VERSION_MAJOR}"
@@ -20,8 +20,8 @@ if(BUILD_DIVSUFSORT64)
   add_library(divsufsort64 ${divsufsort_SRCS})
   install(TARGETS divsufsort64
     RUNTIME DESTINATION bin
-    LIBRARY DESTINATION lib
-    ARCHIVE DESTINATION lib)
+    LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+    ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}")
   set_target_properties(divsufsort64 PROPERTIES
     VERSION   "${LIBRARY_VERSION_FULL}"
     SOVERSION "${LIBRARY_VERSION_MAJOR}"
diff --git a/pkgconfig/CMakeLists.txt b/pkgconfig/CMakeLists.txt
index 1f2f8bc..1d4c318 100644
--- a/pkgconfig/CMakeLists.txt
+++ b/pkgconfig/CMakeLists.txt
@@ -2,9 +2,9 @@
 set(prefix "${CMAKE_INSTALL_PREFIX}")
 set(W64BIT "")
 configure_file("${CMAKE_CURRENT_SOURCE_DIR}/libdivsufsort.pc.cmake" "${CMAKE_CURRENT_BINARY_DIR}/libdivsufsort.pc" @ONLY)
-install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libdivsufsort.pc" DESTINATION lib/pkgconfig)
+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libdivsufsort.pc" DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
 if(BUILD_DIVSUFSORT64)
   set(W64BIT "64")
   configure_file("${CMAKE_CURRENT_SOURCE_DIR}/libdivsufsort.pc.cmake" "${CMAKE_CURRENT_BINARY_DIR}/libdivsufsort64.pc" @ONLY)
-  install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libdivsufsort64.pc" DESTINATION lib/pkgconfig)
+  install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libdivsufsort64.pc" DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
 endif(BUILD_DIVSUFSORT64)
diff --git a/pkgconfig/libdivsufsort.pc.cmake b/pkgconfig/libdivsufsort.pc.cmake
index 84f2272..3e7462f 100644
--- a/pkgconfig/libdivsufsort.pc.cmake
+++ b/pkgconfig/libdivsufsort.pc.cmake
@@ -1,7 +1,7 @@
 prefix=@prefix@
 exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
+libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
+includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
 
 Name: @PROJECT_NAME@@W64BIT@
 Description: @PROJECT_DESCRIPTION@