Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2025-01-14 14:03:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

vendor_*.d: also create these directories in the prefix

Browse source
This commit is contained in:
David Adam 2020-01-20 20:52:58 +08:00
parent 81306d3b30
commit 8ff0c351a9
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
cmake/Install.cmake
View file

@ -113,13 +113,13 @@ INSTALL(FILES share/config.fish
# -$v $(INSTALL) -m 755 -d $(DESTDIR)$(extra_completionsdir) # -$v $(INSTALL) -m 755 -d $(DESTDIR)$(extra_completionsdir)
# -$v $(INSTALL) -m 755 -d $(DESTDIR)$(extra_functionsdir) # -$v $(INSTALL) -m 755 -d $(DESTDIR)$(extra_functionsdir)
# -$v $(INSTALL) -m 755 -d $(DESTDIR)$(extra_confdir) # -$v $(INSTALL) -m 755 -d $(DESTDIR)$(extra_confdir)
# Don't try too hard to create these directories as they may be outside our writeable area # Create only the vendor directories inside the prefix (#5029 / #6508)
# https://github.com/Homebrew/homebrew-core/pull/2813 FISH_CREATE_DIRS(${rel_datadir}/fish/vendor_completions.d ${rel_datadir}/fish/vendor_functions.d
FISH_TRY_CREATE_DIRS(${rel_datadir}/pkgconfig) ${rel_datadir}/fish/vendor_conf.d)
FISH_TRY_CREATE_DIRS(${extra_completionsdir} ${extra_functionsdir} ${extra_confdir})
# @echo "Installing pkgconfig file" # @echo "Installing pkgconfig file"
# $v $(INSTALL) -m 644 fish.pc $(DESTDIR)$(datadir)/pkgconfig # $v $(INSTALL) -m 644 fish.pc $(DESTDIR)$(datadir)/pkgconfig
FISH_TRY_CREATE_DIRS(${rel_datadir}/pkgconfig)
CONFIGURE_FILE(fish.pc.in fish.pc.noversion) CONFIGURE_FILE(fish.pc.in fish.pc.noversion)
ADD_CUSTOM_COMMAND(OUTPUT fish.pc ADD_CUSTOM_COMMAND(OUTPUT fish.pc