From 5bac50f36fcd3099454f81308e60bdadf3df9bc3 Mon Sep 17 00:00:00 2001 From: Mario Fetka Date: Wed, 15 Jul 2026 06:52:35 +0200 Subject: [PATCH] Install system configuration under /etc --- CMakeLists.txt | 10 +++++++++- config/CMakeLists.txt | 2 +- po/prozilla.pot | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 64dab66..598f997 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,8 +1,16 @@ cmake_minimum_required(VERSION 3.20) -project(prozilla VERSION 2.2.3 LANGUAGES C CXX) +project(prozilla VERSION 2.2.4 LANGUAGES C CXX) include(GNUInstallDirs) + +# GNUInstallDirs historically expanded a /usr prefix to /usr/etc. System +# configuration belongs in /etc on FHS systems, independent of /usr. +if(CMAKE_INSTALL_PREFIX STREQUAL "/usr" AND + CMAKE_INSTALL_SYSCONFDIR STREQUAL "etc") + set(CMAKE_INSTALL_SYSCONFDIR "/etc" CACHE PATH + "System configuration directory" FORCE) +endif() include(CheckIncludeFile) include(CheckFunctionExists) diff --git a/config/CMakeLists.txt b/config/CMakeLists.txt index 9517162..8b428a1 100644 --- a/config/CMakeLists.txt +++ b/config/CMakeLists.txt @@ -1 +1 @@ -install(FILES prozilla.conf DESTINATION "${CMAKE_INSTALL_SYSCONFDIR}") +install(FILES prozilla.conf DESTINATION "${CMAKE_INSTALL_FULL_SYSCONFDIR}") diff --git a/po/prozilla.pot b/po/prozilla.pot index 24fe4c3..5e448ec 100644 --- a/po/prozilla.pot +++ b/po/prozilla.pot @@ -6,7 +6,7 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: prozilla 2.2.3\n" +"Project-Id-Version: prozilla 2.2.4\n" "Report-Msgid-Bugs-To: prozilla-dev@disconnected-by-peer.at\n" "POT-Creation-Date: 2026-07-14 20:35+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"