diff options
| author | Franklin Mathieu <franklinmathieu@gmail.com> | 2017-10-21 01:36:26 +0100 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2017-10-21 02:36:26 +0200 |
| commit | 3ce97879d09c5cbeba6fdc5ebd7525b127df18e0 (patch) | |
| tree | 6fa51aa88cc6ac7c53d06015b101516891d40867 | |
| parent | 70683705603e8e0e225574f01bc8b6824d5320eb (diff) | |
| download | rneovim-3ce97879d09c5cbeba6fdc5ebd7525b127df18e0.tar.gz rneovim-3ce97879d09c5cbeba6fdc5ebd7525b127df18e0.tar.bz2 rneovim-3ce97879d09c5cbeba6fdc5ebd7525b127df18e0.zip | |
cmake,bsd: Fix mandir to saner defaults. (#7417)
closes #7239
The old behaviour was to set CMAKE_INSTALL_MANDIR to /usr/local/man
when MANPREFIX wasn't defined. This caused mismatching installation
paths when the installation prefix wasn't /usr/local.
This fix explicitely checks that the prefix is /usr/local to change
the value of CMAKE_INSTALL_MANDIR, and uses the default behaviour
otherwise, as /usr/local is the exception rather than the norm
(as per man hier(7)).
| -rw-r--r-- | cmake/InstallHelpers.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmake/InstallHelpers.cmake b/cmake/InstallHelpers.cmake index ca20ddf354..bebc0d0d17 100644 --- a/cmake/InstallHelpers.cmake +++ b/cmake/InstallHelpers.cmake @@ -2,8 +2,8 @@ if(CMAKE_SYSTEM_NAME MATCHES "BSD" AND NOT DEFINED CMAKE_INSTALL_MANDIR) if(DEFINED ENV{MANPREFIX}) set(CMAKE_INSTALL_MANDIR "$ENV{MANPREFIX}/man") - else() - set(CMAKE_INSTALL_MANDIR "/usr/local/man") + elseif(CMAKE_INSTALL_PREFIX MATCHES "^/usr/local$") + set(CMAKE_INSTALL_MANDIR "man") endif() endif() |