From: Michael Biebl <biebl@debian.org>
Date: Mon, 22 Jan 2024 21:52:25 +0000 (+0100)
Subject: [PATCH] Install PAM modules and systemd units into /usr
X-Git-Tag: archive/raspbian/1%11.4.4-3+rpi1^2~12
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=dc6c167f6f7f5d8f100bdd3ec1847d6f0a6096f4;p=mariadb.git

[PATCH] Install PAM modules and systemd units into /usr

Since Debian trixie all files need to be installed into their canonical
location under /usr.

Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1061348
Forwarded: no

Gbp-Pq: Name install-files-into-usr.patch
---

diff --git a/cmake/install_layout.cmake b/cmake/install_layout.cmake
index eb969679b..3be049898 100644
--- a/cmake/install_layout.cmake
+++ b/cmake/install_layout.cmake
@@ -194,10 +194,10 @@ SET(INSTALL_SUPPORTFILESDIR_DEB         "share/mariadb")
 SET(INSTALL_MYSQLDATADIR_DEB            "/var/lib/mysql")
 
 SET(INSTALL_UNIX_ADDRDIR_DEB            "/run/mysqld/mysqld.sock")
-SET(INSTALL_SYSTEMD_UNITDIR_DEB         "/lib/systemd/system")
+SET(INSTALL_SYSTEMD_UNITDIR_DEB         "/usr/lib/systemd/system")
 SET(INSTALL_SYSTEMD_SYSUSERSDIR_DEB     "/usr/lib/sysusers.d")
 SET(INSTALL_SYSTEMD_TMPFILESDIR_DEB     "/usr/lib/tmpfiles.d")
-SET(INSTALL_PAMDIR_DEB                  "/lib/${CMAKE_CXX_LIBRARY_ARCHITECTURE}/security")
+SET(INSTALL_PAMDIR_DEB                  "/usr/lib/${CMAKE_CXX_LIBRARY_ARCHITECTURE}/security")
 SET(INSTALL_PAMDATADIR_DEB              "/etc/security")
 
 #