Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-12-27 21:33:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

Change extra_*dir options to use prefix instead of /usr/local

Browse source
This commit is contained in:
Simon Ser 2020-04-04 12:30:51 +02:00 committed by Fabian Homborg
parent d9d3557fcf
commit e3684526f2
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -36,6 +36,7 @@
- fish source tarballs are now distributed using the XZ compression method (#5460). - fish source tarballs are now distributed using the XZ compression method (#5460).
- Allow finishing builds on OS X <10.13.6 (previously builds would fail at the `codesign` step) - Allow finishing builds on OS X <10.13.6 (previously builds would fail at the `codesign` step)
- The pkg-config file now uses pkg-config variables - The pkg-config file now uses pkg-config variables
- The default values for the extra_completionsdir, extra_functionsdir and extra_confdir options now use the installation prefix instead of hardcoding `/usr/local`
--- ---

6
cmake/Install.cmake
View file

@ -29,15 +29,15 @@ set(rel_functionsdir "fish/vendor_functions.d")
set(rel_confdir "fish/vendor_conf.d") set(rel_confdir "fish/vendor_conf.d")
set(extra_completionsdir set(extra_completionsdir
"/usr/local/share/${rel_completionsdir}" "${datadir}/${rel_completionsdir}"
CACHE STRING "Path for extra completions") CACHE STRING "Path for extra completions")
set(extra_functionsdir set(extra_functionsdir
"/usr/local/share/${rel_functionsdir}" "${datadir}/${rel_functionsdir}"
CACHE STRING "Path for extra functions") CACHE STRING "Path for extra functions")
set(extra_confdir set(extra_confdir
"/usr/local/share/${rel_confdir}" "${datadir}/${rel_confdir}"
CACHE STRING "Path for extra configuration") CACHE STRING "Path for extra configuration")
# These are the man pages that go in system manpath; all manpages go in the fish-specific manpath. # These are the man pages that go in system manpath; all manpages go in the fish-specific manpath.