Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix: [CMake] Fix install paths using GNUInstallDirs #8226

Merged
merged 1 commit into from Jun 18, 2020
Merged

Fix: [CMake] Fix install paths using GNUInstallDirs #8226

merged 1 commit into from Jun 18, 2020

Conversation

h3xx
Copy link
Contributor

@h3xx h3xx commented Jun 18, 2020

  • Fix man page installation path /usr/share/man/openttd.6 => /usr/share/man/man6/openttd.6.
  • Adds, as a side effect, the ability to override install paths using -DCMAKE_INSTALL_*. See GNUInstallDirs.

(This is a simplified version of #8218 that changes as little as possible, in order to expedite the review process. Unfortunately some changes in #8218 are not compatible, but most of them are. There are further enhancements in #8218 that this doesn't cover.)

@LordAro LordAro requested a review from glx22 June 18, 2020 16:54
Copy link
Contributor

@glx22 glx22 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me. Of course I'll need to take care of hardcoded /openttd in #8218, but it's not blocking.

@LordAro LordAro merged commit 506598a into OpenTTD:master Jun 18, 2020
@h3xx h3xx deleted the gnu-cmake-install-paths branch June 19, 2020 00:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants