Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s
22 lines
832 B
Diff
22 lines
832 B
Diff
Fix CMake install path
|
|
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -1879,11 +1879,11 @@
|
|
|
|
set(prefix "${CMAKE_INSTALL_PREFIX}")
|
|
set(exec_prefix "\${prefix}")
|
|
-set(bindir "\${exec_prefix}/${CMAKE_INSTALL_BINDIR}")
|
|
-set(sbindir "\${exec_prefix}/${CMAKE_INSTALL_SBINDIR}")
|
|
-set(libdir "\${prefix}/${CMAKE_INSTALL_LIBDIR}")
|
|
-set(includedir "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}")
|
|
-set(datarootdir "\${prefix}/${CMAKE_INSTALL_DATAROOTDIR}")
|
|
+set(bindir "${CMAKE_INSTALL_FULL_BINDIR}")
|
|
+set(sbindir "${CMAKE_INSTALL_FULL_SBINDIR}")
|
|
+set(libdir "${CMAKE_INSTALL_FULL_LIBDIR}")
|
|
+set(includedir "${CMAKE_INSTALL_FULL_INCLUDEDIR}")
|
|
+set(datarootdir "${CMAKE_INSTALL_FULL_DATAROOTDIR}")
|
|
set(datadir "\${datarootdir}")
|
|
set(expanded_pluginsdir "${GRN_PLUGINS_DIR}")
|
|
set(GRN_EXPANDED_DEFAULT_DOCUMENT_ROOT "${GRN_DEFAULT_DOCUMENT_ROOT}")
|