From 4f0495628939deff8e5760dafaa8df8942fb1856 Mon Sep 17 00:00:00 2001 From: Bas Couwenberg Date: Sat, 16 Mar 2024 18:01:44 +0100 Subject: [PATCH] Fix installation when using DESTDIR. (#411) The Debian package build failed after switching to CMake because it uses `DESTDIR` to install under `debian/tmp`. --- CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 31eab2a1..9a2047aa 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -127,9 +127,9 @@ endif() set(MAPNIK_FONTS_DIR "${MAPNIK_FONTS_DIR}") set(MAPNIK_FONTS_DIR_RECURSE 0) set(MAPNIK_PLUGINS_DIR "${MAPNIK_PLUGINS_DIR}") -set(RENDERD_CONFIG "/${CMAKE_INSTALL_SYSCONFDIR}/renderd.conf") -set(RENDERD_RUN_DIR "/${CMAKE_INSTALL_RUNSTATEDIR}/renderd") -set(RENDERD_TILE_DIR "/${CMAKE_INSTALL_LOCALSTATEDIR}/cache/renderd/tiles") +set(RENDERD_CONFIG "${CMAKE_INSTALL_SYSCONFDIR}/renderd.conf") +set(RENDERD_RUN_DIR "${CMAKE_INSTALL_RUNSTATEDIR}/renderd") +set(RENDERD_TILE_DIR "${CMAKE_INSTALL_LOCALSTATEDIR}/cache/renderd/tiles") set(RENDERD_PIDFILE "${RENDERD_RUN_DIR}/renderd.pid") set(RENDERD_SOCKET "${RENDERD_RUN_DIR}/renderd.sock") @@ -226,7 +226,7 @@ install( install( FILES ${PROJECT_BINARY_DIR}/renderd.conf - DESTINATION /${CMAKE_INSTALL_SYSCONFDIR} + DESTINATION ${CMAKE_INSTALL_SYSCONFDIR} ) # Targets