diff options
| author | Timo Röhling <roehling@debian.org> | 2021-10-07 17:45:39 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2021-10-07 18:29:18 (GMT) |
| commit | 6658e260d481f5e51537cffefcd3aac6844d529d (patch) | |
| tree | eaf29f73c462ca1187a585501ec7f7fd3abb0591 /Tests | |
| parent | c9b27dace7e4110b25d5889e9c6952d0f4a7ca58 (diff) | |
| download | CMake-6658e260d481f5e51537cffefcd3aac6844d529d.zip CMake-6658e260d481f5e51537cffefcd3aac6844d529d.tar.gz CMake-6658e260d481f5e51537cffefcd3aac6844d529d.tar.bz2 | |
GNUInstallDirs: Fix misinterpretation of Debian Policy on LIBEXECDIR
Revert commit 798c1c3192 (GNUInstallDirs: Comply with Debian Policy on
LIBEXECDIR, 2020-10-08, v3.19.0-rc1~11^2).
The Debian Policy builds upon FHS 3.0 and permits installing to
`/usr/libexec`. While Policy does grant an additional exception for
applications to use a single subdirectory of `/usr/lib/<triplet>`, this
is not meant to replace `/usr/libexec` as valid target.
Fixes: #22731
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/RunCMake/GNUInstallDirs/Usr-Debian-stderr.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Tests/RunCMake/GNUInstallDirs/Usr-Debian-stderr.txt b/Tests/RunCMake/GNUInstallDirs/Usr-Debian-stderr.txt index 89578ee..c38006c 100644 --- a/Tests/RunCMake/GNUInstallDirs/Usr-Debian-stderr.txt +++ b/Tests/RunCMake/GNUInstallDirs/Usr-Debian-stderr.txt @@ -5,7 +5,7 @@ CMAKE_INSTALL_DOCDIR='share/doc/Usr' CMAKE_INSTALL_INCLUDEDIR='include' CMAKE_INSTALL_INFODIR='share/info' CMAKE_INSTALL_LIBDIR='lib/arch' -CMAKE_INSTALL_LIBEXECDIR='lib/arch' +CMAKE_INSTALL_LIBEXECDIR='libexec' CMAKE_INSTALL_LOCALEDIR='share/locale' CMAKE_INSTALL_LOCALSTATEDIR='var' CMAKE_INSTALL_RUNSTATEDIR='var/run' @@ -20,7 +20,7 @@ CMAKE_INSTALL_FULL_DOCDIR='/usr/share/doc/Usr' CMAKE_INSTALL_FULL_INCLUDEDIR='/usr/include' CMAKE_INSTALL_FULL_INFODIR='/usr/share/info' CMAKE_INSTALL_FULL_LIBDIR='/usr/lib/arch' -CMAKE_INSTALL_FULL_LIBEXECDIR='/usr/lib/arch' +CMAKE_INSTALL_FULL_LIBEXECDIR='/usr/libexec' CMAKE_INSTALL_FULL_LOCALEDIR='/usr/share/locale' CMAKE_INSTALL_FULL_LOCALSTATEDIR='/var' CMAKE_INSTALL_FULL_RUNSTATEDIR='/var/run' |