Skip to content

Commit adab37d

Browse files
committed
build: prefer the GNU install dirs uniformly
Use the GNU install dirs variables to control the install behaviour rather than hardcoding the paths and tweaking the library directory suffix.
1 parent 845897a commit adab37d

File tree

2 files changed

+13
-13
lines changed

2 files changed

+13
-13
lines changed

extensions/CMakeLists.txt

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -64,16 +64,17 @@ set(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_NO_WARNINGS ON)
6464

6565
install(TARGETS ${CMARK_INSTALL}
6666
EXPORT cmark-gfm-extensions
67-
RUNTIME DESTINATION bin
68-
LIBRARY DESTINATION lib${LIB_SUFFIX}
69-
ARCHIVE DESTINATION lib${LIB_SUFFIX}
67+
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
68+
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
69+
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
7070
)
7171

7272
if (CMARK_SHARED OR CMARK_STATIC)
7373
install(FILES
7474
${CMAKE_CURRENT_SOURCE_DIR}/include/cmark-gfm-core-extensions.h
7575
${CMAKE_CURRENT_SOURCE_DIR}/include/module.modulemap
76-
DESTINATION include/cmark_gfm_extensions)
76+
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/cmark_gfm_extensions)
7777

78-
install(EXPORT cmark-gfm-extensions DESTINATION lib${LIB_SUFFIX}/cmake-gfm-extensions)
78+
install(EXPORT cmark-gfm-extensions
79+
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake-gfm-extensions)
7980
endif()

src/CMakeLists.txt

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -98,20 +98,18 @@ if (CMARK_STATIC)
9898
list(APPEND CMARK_INSTALL ${STATICLIBRARY})
9999
endif()
100100

101-
set(libdir lib${LIB_SUFFIX})
102-
103101
install(TARGETS ${PROGRAM} ${CMARK_INSTALL}
104102
EXPORT cmark-gfm
105-
RUNTIME DESTINATION bin
106-
LIBRARY DESTINATION ${libdir}
107-
ARCHIVE DESTINATION ${libdir}
103+
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
104+
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
105+
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
108106
)
109107

110108
if(CMARK_SHARED OR CMARK_STATIC)
111109
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libcmark-gfm.pc.in
112110
${CMAKE_CURRENT_BINARY_DIR}/libcmark-gfm.pc @ONLY)
113111
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libcmark-gfm.pc
114-
DESTINATION ${libdir}/pkgconfig)
112+
DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
115113

116114
install(FILES
117115
${CMAKE_CURRENT_SOURCE_DIR}/include/buffer.h
@@ -139,10 +137,11 @@ if(CMARK_SHARED OR CMARK_STATIC)
139137
${CMAKE_CURRENT_SOURCE_DIR}/include/syntax_extension.h
140138
${CMAKE_CURRENT_SOURCE_DIR}/include/utf8.h
141139
${CMAKE_CURRENT_SOURCE_DIR}/include/module.modulemap
142-
DESTINATION include/cmark_gfm
140+
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/cmark_gfm
143141
)
144142

145-
install(EXPORT cmark-gfm DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
143+
install(EXPORT cmark-gfm
144+
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
146145

147146
set(CMARK_TARGETS_FILE ${CMAKE_CURRENT_BINARY_DIR}/cmarkTargets.cmake)
148147
export(TARGETS ${CMARK_INSTALL} FILE ${CMARK_TARGETS_FILE})

0 commit comments

Comments
 (0)