cmark

My personal build of CMark ✏️

Commit: 8d1bc580984dffab9d852a93f524701906dd778c
Parent: f20963d56fd8be2111ae651e7286ba2d2af9e4da
Author: Vitaly Zaitsev <vitaly@easycoding.org>
Date: Thu, 3 Dec 2020 19:48:22 +0100

Fixed installation on other than Ubuntu GNU/Linux distributions.

Signed-off-by: Vitaly Zaitsev <vitaly@easycoding.org>

Diffstat

2 files changed, 11 insertions, 12 deletions

Status	File Name	N° Changes	Insertions	Deletions
Modified	src/CMakeLists.txt	19	9	10
Modified	src/libcmark.pc.in	4	2	2

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -49,6 +49,7 @@ set(PROGRAM_SOURCES main.c)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmark_version.h.in
   ${CMAKE_CURRENT_BINARY_DIR}/cmark_version.h)
 
+include(GNUInstallDirs)
 include (GenerateExportHeader)
 
 add_executable(${PROGRAM} ${PROGRAM_SOURCES})
@@ -121,26 +122,24 @@ if(NOT MSVC OR CMAKE_HOST_SYSTEM_NAME STREQUAL Windows)
   include(InstallRequiredSystemLibraries)
 endif()
 
-set(libdir lib${LIB_SUFFIX})
-
 install(TARGETS ${PROGRAM} ${CMARK_INSTALL}
   EXPORT cmark-targets
-  RUNTIME DESTINATION bin
-  LIBRARY DESTINATION ${libdir}
-  ARCHIVE DESTINATION ${libdir}
+  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+  ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
   )
 
 if(CMARK_SHARED OR CMARK_STATIC)
   configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libcmark.pc.in
     ${CMAKE_CURRENT_BINARY_DIR}/libcmark.pc @ONLY)
   install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libcmark.pc
-    DESTINATION ${libdir}/pkgconfig)
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
 
   install(FILES
     cmark.h
     ${CMAKE_CURRENT_BINARY_DIR}/cmark_export.h
     ${CMAKE_CURRENT_BINARY_DIR}/cmark_version.h
-    DESTINATION include
+    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
     )
 
   # Include module for fuctions
@@ -151,7 +150,7 @@ if(CMARK_SHARED OR CMARK_STATIC)
   configure_package_config_file(
     "cmarkConfig.cmake.in"
     "${CMAKE_CURRENT_BINARY_DIR}/generated/cmark-config.cmake"
-    INSTALL_DESTINATION "lib/cmake/cmark")
+    INSTALL_DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/cmark")
   write_basic_package_version_file(
     "${CMAKE_CURRENT_BINARY_DIR}/generated/cmark-config-version.cmake"
     VERSION ${PROJECT_VERSION}
@@ -160,13 +159,13 @@ if(CMARK_SHARED OR CMARK_STATIC)
   install(
     FILES "${CMAKE_CURRENT_BINARY_DIR}/generated/cmark-config.cmake"
           "${CMAKE_CURRENT_BINARY_DIR}/generated/cmark-config-version.cmake"
-    DESTINATION "lib/cmake/cmark"
+    DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/cmark"
   )
   # install targets file
   install(
     EXPORT "cmark-targets"
     NAMESPACE "cmark::"
-    DESTINATION "lib/cmake/cmark"
+    DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/cmark"
   )
 
 endif()

diff --git a/src/libcmark.pc.in b/src/libcmark.pc.in
@@ -1,7 +1,7 @@
 prefix=@CMAKE_INSTALL_PREFIX@
 exec_prefix=@CMAKE_INSTALL_PREFIX@
-libdir=@CMAKE_INSTALL_PREFIX@/@libdir@
-includedir=@CMAKE_INSTALL_PREFIX@/include
+libdir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@
+includedir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@
 
 Name: libcmark
 Description: CommonMark parsing, rendering, and manipulation