diff options
| author | Tobias C. Berner <tcberner@FreeBSD.org> | 2018-11-11 20:04:46 +0100 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2018-11-13 13:35:50 -0500 |
| commit | f835f189aeb38a791ad09ba5c2d89300a3fd16f1 (patch) | |
| tree | 5b863c4008f0a5ef7a706c6b254dbb50d9214ff5 /Tests/RunCMake/GNUInstallDirs | |
| parent | 4c0d97dd98805a5d9fc73ab9818a653888c16103 (diff) | |
| download | cmake-f835f189aeb38a791ad09ba5c2d89300a3fd16f1.tar.gz | |
GNUInstallDirs: Update FreeBSD "info" destination to share/info
FreeBSD ports commit r484628 (Install texinfo files (GNU info) into
${PREFIX}/share/info, 2018-11-10) changed the "info" destination
from "info" to "share/info". The commit included a patch to their
distribution of CMake to fix the `GNUInstallDirs` module too.
Apply a similar logic change to our upstream version of the module.
We already made a similar change for GNU/kFreeBSD in commit
v3.13.0-rc2~8^2 (GNUInstallDirs: Don't use BSD info and man paths on
GNU/kFreeBSD, 2018-10-21).
Fixes: #18585
Diffstat (limited to 'Tests/RunCMake/GNUInstallDirs')
4 files changed, 8 insertions, 8 deletions
diff --git a/Tests/RunCMake/GNUInstallDirs/Opt-FreeBSD-stderr.txt b/Tests/RunCMake/GNUInstallDirs/Opt-FreeBSD-stderr.txt index 09ae303341..feb747b182 100644 --- a/Tests/RunCMake/GNUInstallDirs/Opt-FreeBSD-stderr.txt +++ b/Tests/RunCMake/GNUInstallDirs/Opt-FreeBSD-stderr.txt @@ -3,7 +3,7 @@ CMAKE_INSTALL_DATADIR='share' CMAKE_INSTALL_DATAROOTDIR='share' CMAKE_INSTALL_DOCDIR='share/doc/Opt' CMAKE_INSTALL_INCLUDEDIR='include' -CMAKE_INSTALL_INFODIR='info' +CMAKE_INSTALL_INFODIR='share/info' CMAKE_INSTALL_LIBDIR='(lib|lib64)' CMAKE_INSTALL_LIBEXECDIR='libexec' CMAKE_INSTALL_LOCALEDIR='share/locale' @@ -18,7 +18,7 @@ CMAKE_INSTALL_FULL_DATADIR='/opt/Opt/share' CMAKE_INSTALL_FULL_DATAROOTDIR='/opt/Opt/share' CMAKE_INSTALL_FULL_DOCDIR='/opt/Opt/share/doc/Opt' CMAKE_INSTALL_FULL_INCLUDEDIR='/opt/Opt/include' -CMAKE_INSTALL_FULL_INFODIR='/opt/Opt/info' +CMAKE_INSTALL_FULL_INFODIR='/opt/Opt/share/info' CMAKE_INSTALL_FULL_LIBDIR='/opt/Opt/(lib|lib64)' CMAKE_INSTALL_FULL_LIBEXECDIR='/opt/Opt/libexec' CMAKE_INSTALL_FULL_LOCALEDIR='/opt/Opt/share/locale' diff --git a/Tests/RunCMake/GNUInstallDirs/Root-FreeBSD-stderr.txt b/Tests/RunCMake/GNUInstallDirs/Root-FreeBSD-stderr.txt index 4be66bcaff..4284a15b18 100644 --- a/Tests/RunCMake/GNUInstallDirs/Root-FreeBSD-stderr.txt +++ b/Tests/RunCMake/GNUInstallDirs/Root-FreeBSD-stderr.txt @@ -3,7 +3,7 @@ CMAKE_INSTALL_DATADIR='usr/share' CMAKE_INSTALL_DATAROOTDIR='usr/share' CMAKE_INSTALL_DOCDIR='usr/share/doc/Root' CMAKE_INSTALL_INCLUDEDIR='usr/include' -CMAKE_INSTALL_INFODIR='usr/info' +CMAKE_INSTALL_INFODIR='usr/share/info' CMAKE_INSTALL_LIBDIR='usr/(lib|lib64)' CMAKE_INSTALL_LIBEXECDIR='usr/libexec' CMAKE_INSTALL_LOCALEDIR='usr/share/locale' @@ -18,7 +18,7 @@ CMAKE_INSTALL_FULL_DATADIR='/usr/share' CMAKE_INSTALL_FULL_DATAROOTDIR='/usr/share' CMAKE_INSTALL_FULL_DOCDIR='/usr/share/doc/Root' CMAKE_INSTALL_FULL_INCLUDEDIR='/usr/include' -CMAKE_INSTALL_FULL_INFODIR='/usr/info' +CMAKE_INSTALL_FULL_INFODIR='/usr/share/info' CMAKE_INSTALL_FULL_LIBDIR='/usr/(lib|lib64)' CMAKE_INSTALL_FULL_LIBEXECDIR='/usr/libexec' CMAKE_INSTALL_FULL_LOCALEDIR='/usr/share/locale' diff --git a/Tests/RunCMake/GNUInstallDirs/Usr-FreeBSD-stderr.txt b/Tests/RunCMake/GNUInstallDirs/Usr-FreeBSD-stderr.txt index 3d7b4c853e..9efc1103ee 100644 --- a/Tests/RunCMake/GNUInstallDirs/Usr-FreeBSD-stderr.txt +++ b/Tests/RunCMake/GNUInstallDirs/Usr-FreeBSD-stderr.txt @@ -3,7 +3,7 @@ CMAKE_INSTALL_DATADIR='share' CMAKE_INSTALL_DATAROOTDIR='share' CMAKE_INSTALL_DOCDIR='share/doc/Usr' CMAKE_INSTALL_INCLUDEDIR='include' -CMAKE_INSTALL_INFODIR='info' +CMAKE_INSTALL_INFODIR='share/info' CMAKE_INSTALL_LIBDIR='(lib|lib64|lib/arch)' CMAKE_INSTALL_LIBEXECDIR='libexec' CMAKE_INSTALL_LOCALEDIR='share/locale' @@ -18,7 +18,7 @@ CMAKE_INSTALL_FULL_DATADIR='/usr/share' CMAKE_INSTALL_FULL_DATAROOTDIR='/usr/share' CMAKE_INSTALL_FULL_DOCDIR='/usr/share/doc/Usr' CMAKE_INSTALL_FULL_INCLUDEDIR='/usr/include' -CMAKE_INSTALL_FULL_INFODIR='/usr/info' +CMAKE_INSTALL_FULL_INFODIR='/usr/share/info' CMAKE_INSTALL_FULL_LIBDIR='/usr/(lib|lib64|lib/arch)' CMAKE_INSTALL_FULL_LIBEXECDIR='/usr/libexec' CMAKE_INSTALL_FULL_LOCALEDIR='/usr/share/locale' diff --git a/Tests/RunCMake/GNUInstallDirs/UsrLocal-FreeBSD-stderr.txt b/Tests/RunCMake/GNUInstallDirs/UsrLocal-FreeBSD-stderr.txt index e1425d5743..505bf08efc 100644 --- a/Tests/RunCMake/GNUInstallDirs/UsrLocal-FreeBSD-stderr.txt +++ b/Tests/RunCMake/GNUInstallDirs/UsrLocal-FreeBSD-stderr.txt @@ -3,7 +3,7 @@ CMAKE_INSTALL_DATADIR='share' CMAKE_INSTALL_DATAROOTDIR='share' CMAKE_INSTALL_DOCDIR='share/doc/UsrLocal' CMAKE_INSTALL_INCLUDEDIR='include' -CMAKE_INSTALL_INFODIR='info' +CMAKE_INSTALL_INFODIR='share/info' CMAKE_INSTALL_LIBDIR='(lib|lib64)' CMAKE_INSTALL_LIBEXECDIR='libexec' CMAKE_INSTALL_LOCALEDIR='share/locale' @@ -18,7 +18,7 @@ CMAKE_INSTALL_FULL_DATADIR='/usr/local/share' CMAKE_INSTALL_FULL_DATAROOTDIR='/usr/local/share' CMAKE_INSTALL_FULL_DOCDIR='/usr/local/share/doc/UsrLocal' CMAKE_INSTALL_FULL_INCLUDEDIR='/usr/local/include' -CMAKE_INSTALL_FULL_INFODIR='/usr/local/info' +CMAKE_INSTALL_FULL_INFODIR='/usr/local/share/info' CMAKE_INSTALL_FULL_LIBDIR='/usr/local/(lib|lib64)' CMAKE_INSTALL_FULL_LIBEXECDIR='/usr/local/libexec' CMAKE_INSTALL_FULL_LOCALEDIR='/usr/local/share/locale' |