646b892680
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
27 lines
936 B
Diff
27 lines
936 B
Diff
diff --git a/cmake/MapnikExportPkgConfig.cmake b/cmake/MapnikExportPkgConfig.cmake
|
|
index f12ed57f1..548e1e6e9 100644
|
|
--- a/cmake/MapnikExportPkgConfig.cmake
|
|
+++ b/cmake/MapnikExportPkgConfig.cmake
|
|
@@ -3,7 +3,7 @@ function(create_pkg_config_file _target _lib_name _description)
|
|
prefix=@CMAKE_INSTALL_PREFIX@
|
|
exec_prefix=${prefix}
|
|
includedir=${prefix}/include
|
|
-libdir=${exec_prefix}/@MAPNIK_LIB_DIR@
|
|
+libdir=${exec_prefix}@MAPNIK_LIB_DIR@
|
|
|
|
Name: @_lib_name@
|
|
Description: @_description@
|
|
@@ -64,9 +64,9 @@ function(create_pkg_config_file_mapnik _lib_name _description)
|
|
prefix=@CMAKE_INSTALL_PREFIX@
|
|
exec_prefix=${prefix}
|
|
includedir=${prefix}/include
|
|
-libdir=${exec_prefix}/@MAPNIK_LIB_DIR@
|
|
-fonts_dir=${prefix}/@FONTS_INSTALL_DIR@
|
|
-plugins_dir=${prefix}/@PLUGINS_INSTALL_DIR@
|
|
+libdir=${exec_prefix}@MAPNIK_LIB_DIR@
|
|
+fonts_dir=@FONTS_INSTALL_DIR@
|
|
+plugins_dir=@PLUGINS_INSTALL_DIR@
|
|
|
|
Name: @_lib_name@
|
|
Description: @_description@
|