From 1a878af2f76b926f9d5eff4992cb9fec44b1a97f Mon Sep 17 00:00:00 2001
From: David Hummel <6109326+hummeltech@users.noreply.github.com>
Date: Sun, 16 Jun 2024 13:01:38 -0700
Subject: [PATCH 1/2] Update `INSTALL.md`

---
 INSTALL.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/INSTALL.md b/INSTALL.md
index e226c1709..58e6ca91b 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -42,8 +42,8 @@ To use a Python interpreter that is not named `python` for your build, do
 something like the following instead:
 
 ```bash
-    $ PYTHON=python2 ./configure
-    $ make PYTHON=python2
+    $ PYTHON=python3 ./configure
+    $ make PYTHON=python3
 ```
 
 NOTE: the above will not work on windows, rather see https://github.com/mapnik/mapnik/wiki/WindowsInstallation
@@ -71,15 +71,15 @@ For troubleshooting help see https://github.com/mapnik/mapnik/wiki/InstallationT
 
 Build system dependencies are:
 
- * C++ compiler supporting `-std=c++14` (like >= g++ 4.8 or >= clang++ 3.4)
- * >= 2 GB RAM (> 5 GB for g++)
- * Python 2.4-2.7 
+ * C++ compiler supporting `-std=c++17` (like >= g++ 9 or >= clang++ 5)
+ * \>= 2 GB RAM (> 5 GB for g++)
+ * Python 3
  * Scons (a copy is bundled) or CMake >= 3.15 see [docs/cmake-usage.md](./docs/cmake-usage.md)
 
 Mapnik Core depends on:
 
  * Boost
-    - >= 1.73 is required
+    - \>= 1.73 is required
     - These libraries are used:
       - filesystem
       - system

From 0e0aed3bde17d1061fdb3257aa39c5d69877ac43 Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Wed, 19 Jun 2024 19:16:35 +0100
Subject: [PATCH 2/2] Use CMAKE_INSTALL_LIBDIR for libdir in pkg-config files

---
 cmake/MapnikExportPkgConfig.cmake | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cmake/MapnikExportPkgConfig.cmake b/cmake/MapnikExportPkgConfig.cmake
index e8b69065b..4cffd5c71 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}/lib
+libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
 
 Name: @_lib_name@
 Description: @_description@
@@ -64,7 +64,7 @@ function(create_pkg_config_file_mapnik _lib_name _description)
 prefix=@CMAKE_INSTALL_PREFIX@
 exec_prefix=${prefix}
 includedir=${prefix}/include
-libdir=${exec_prefix}/lib
+libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
 fonts_dir=${prefix}/@FONTS_INSTALL_DIR@
 plugins_dir=${prefix}/@PLUGINS_INSTALL_DIR@