]> git.ipfire.org Git - thirdparty/xz.git/commitdiff
Revert "CMake: Set only "prefix" as an absolute path in liblzma.pc"
authorLasse Collin <lasse.collin@tukaani.org>
Sun, 16 Jun 2024 15:33:08 +0000 (18:33 +0300)
committerLasse Collin <lasse.collin@tukaani.org>
Mon, 17 Jun 2024 15:01:39 +0000 (18:01 +0300)
This reverts commit 5d1c649ba9eb7a5b9371252ebfbc2911dc774e69.

While CMAKE_INSTALL_<dir> tend to be relative paths, they don't need
to be. Thus the commit was broken. A fancier method is required.

Thanks to Eli Schwartz for the bug report and explanation.

CMakeLists.txt

index 210e71ce1c280253d2a4bd04ab1a9aec4a4a6e94..5b0ebe3dd5a90126d58e295c3e82fad443237bd0 100644 (file)
@@ -1415,9 +1415,9 @@ file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/liblzma-config.cmake"
 
 # Create liblzma.pc.
 set(prefix "${CMAKE_INSTALL_PREFIX}")
-set(exec_prefix "\${prefix}")
-set(libdir "\${exec_prefix}/${CMAKE_INSTALL_LIBDIR}")
-set(includedir "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}")
+set(exec_prefix "${CMAKE_INSTALL_PREFIX}")
+set(libdir "${CMAKE_INSTALL_FULL_LIBDIR}")
+set(includedir "${CMAKE_INSTALL_FULL_INCLUDEDIR}")
 set(PTHREAD_CFLAGS "${CMAKE_THREAD_LIBS_INIT}")
 configure_file(src/liblzma/liblzma.pc.in liblzma.pc
                @ONLY