From: userwithuid <userwithuid@gmail.com>
Date: Tue, 21 Aug 2018 06:30:48 +0000 (+0000)
Subject: CMake: Use GNUInstallDirs for pkgconfig too
X-Git-Tag: R_2_2_7~26^2~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=23cf8dc612584eb5dae27fc7e13dff224467f3be;p=libexpat

CMake: Use GNUInstallDirs for pkgconfig too

Fixes i.e. multilib setups on linux

Follow-up to 5681911965ef
---

diff --git a/expat/CMakeLists.txt b/expat/CMakeLists.txt
index a537f8a7..673184fa 100644
--- a/expat/CMakeLists.txt
+++ b/expat/CMakeLists.txt
@@ -187,8 +187,8 @@ expat_install(TARGETS expat RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
 
 set(prefix ${CMAKE_INSTALL_PREFIX})
 set(exec_prefix "\${prefix}")
-set(libdir "\${exec_prefix}/lib")
-set(includedir "\${prefix}/include")
+set(libdir "\${exec_prefix}/${CMAKE_INSTALL_LIBDIR}")
+set(includedir "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}")
 configure_file(expat.pc.in ${CMAKE_CURRENT_BINARY_DIR}/expat.pc @ONLY)
 
 expat_install(FILES lib/expat.h lib/expat_external.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})