commit 96b255b95c1b9b7b0604d635c75e2839d8c86b23
author Eugene Kliuchnikov <eustas.ru@gmail.com> Fri Dec 08 16:31:08 2023 +0100
committer GitHub <noreply@github.com> Fri Dec 08 16:31:08 2023 +0100
tree df3567d4c11730c54544b4b24b386617e15e31e6
parent bf867c126b4f855c1c8ec8867a62e5248b0248e5
parent 0d1a0a4dfd50d572d6c452833662359b89e6da6d

Merge branch 'master' into dependabot/github_actions/actions/setup-python-4.7.1

.github/workflows/scorecard.yml

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 70fa9c1..1d4c449 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -41,7 +41,7 @@
           persist-credentials: false
 
       - name: "Run analysis"
-        uses: ossf/scorecard-action@08b4669551908b1024bb425080c797723083c031 # v2.2.0
+        uses: ossf/scorecard-action@0864cf19026789058feabb7e87baa5f140aac736 # v2.3.1
         with:
           results_file: results.sarif
           results_format: sarif

CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c5449a9..70d0f6c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -114,7 +114,7 @@
 elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
   add_definitions(-DOS_MACOSX)
   set(CMAKE_MACOS_RPATH TRUE)
-  set(CMAKE_INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib")
+  set(CMAKE_INSTALL_NAME_DIR "${CMAKE_INSTALL_FULL_LIBDIR}")
 endif()
 
 if(BROTLI_EMSCRIPTEN)
@@ -362,11 +362,11 @@
 
 if (BROTLI_BUILD_TOOLS)
   install(FILES "docs/brotli.1"
-    DESTINATION "${SHARE_INSTALL_PREFIX}/man/man1")
+    DESTINATION "${CMAKE_INSTALL_FULL_MANDIR}/man1")
 endif()
 
 install(FILES docs/constants.h.3 docs/decode.h.3 docs/encode.h.3 docs/types.h.3
-  DESTINATION "${SHARE_INSTALL_PREFIX}/man/man3")
+  DESTINATION "${CMAKE_INSTALL_FULL_MANDIR}/man3")
 
 if (ENABLE_COVERAGE STREQUAL "yes")
   setup_target_for_coverage(coverage test coverage)