99b33a49a2
* Add LIB_SUFFIX to libdir path in the pkg-config file OBS-URL: https://build.opensuse.org/package/show/Archiving/libarchive?expand=0&rev=126
43 lines
1.7 KiB
Diff
43 lines
1.7 KiB
Diff
Index: b/libarchive/CMakeLists.txt
|
|
===================================================================
|
|
--- a/libarchive/CMakeLists.txt
|
|
+++ b/libarchive/CMakeLists.txt
|
|
@@ -266,13 +266,13 @@ IF(ENABLE_INSTALL)
|
|
IF(BUILD_SHARED_LIBS)
|
|
INSTALL(TARGETS archive
|
|
RUNTIME DESTINATION bin
|
|
- LIBRARY DESTINATION lib
|
|
- ARCHIVE DESTINATION lib)
|
|
+ LIBRARY DESTINATION lib${LIB_SUFFIX}
|
|
+ ARCHIVE DESTINATION lib${LIB_SUFFIX})
|
|
ENDIF(BUILD_SHARED_LIBS)
|
|
INSTALL(TARGETS archive_static
|
|
RUNTIME DESTINATION bin
|
|
- LIBRARY DESTINATION lib
|
|
- ARCHIVE DESTINATION lib)
|
|
+ LIBRARY DESTINATION lib${LIB_SUFFIX}
|
|
+ ARCHIVE DESTINATION lib${LIB_SUFFIX})
|
|
INSTALL_MAN(${libarchive_MANS})
|
|
INSTALL(FILES ${include_HEADERS} DESTINATION include)
|
|
ENDIF()
|
|
Index: b/build/cmake/CreatePkgConfigFile.cmake
|
|
===================================================================
|
|
--- a/build/cmake/CreatePkgConfigFile.cmake
|
|
+++ b/build/cmake/CreatePkgConfigFile.cmake
|
|
@@ -4,7 +4,7 @@
|
|
# Set the required variables (we use the same input file as autotools)
|
|
SET(prefix ${CMAKE_INSTALL_PREFIX})
|
|
SET(exec_prefix \${prefix})
|
|
-SET(libdir \${exec_prefix}/lib)
|
|
+SET(libdir \${exec_prefix}/lib${LIB_SUFFIX})
|
|
SET(includedir \${prefix}/include)
|
|
# Now, this is not particularly pretty, nor is it terribly accurate...
|
|
# Loop over all our additional libs
|
|
@@ -29,5 +29,5 @@ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DI
|
|
# And install it, of course ;).
|
|
IF(ENABLE_INSTALL)
|
|
INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/build/pkgconfig/libarchive.pc
|
|
- DESTINATION "lib/pkgconfig")
|
|
+ DESTINATION "lib${LIB_SUFFIX}/pkgconfig")
|
|
ENDIF()
|