Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-11-10 15:14:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

Do create installation directories that already exist

Browse source 
Reverts 71329a250b.

That tried to fix problems with pkgconfig by not recreating it.
Instead, use the function we already have for not trying too hard to
create a directory.

Fixes #5735.
This commit is contained in:
Fabian Homborg 2019-03-12 18:49:08 +01:00
parent 8a0d794337
commit bfb61879cd
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cmake/Install.cmake
View file

@ -53,9 +53,7 @@ ENDIF()
# Define a function to help us create directories. # Define a function to help us create directories.
FUNCTION(FISH_CREATE_DIRS) FUNCTION(FISH_CREATE_DIRS)
FOREACH(dir ${ARGV}) FOREACH(dir ${ARGV})
IF(NOT EXISTS ${CMAKE_INSTALL_PREFIX}/${dir}) INSTALL(DIRECTORY DESTINATION ${dir})
INSTALL(DIRECTORY DESTINATION ${dir})
ENDIF()
ENDFOREACH(dir) ENDFOREACH(dir)
ENDFUNCTION(FISH_CREATE_DIRS) ENDFUNCTION(FISH_CREATE_DIRS)
@ -113,9 +111,9 @@ 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)
FISH_CREATE_DIRS(${rel_datadir}/pkgconfig)
# Don't try too hard to create these directories as they may be outside our writeable area # Don't try too hard to create these directories as they may be outside our writeable area
# https://github.com/Homebrew/homebrew-core/pull/2813 # https://github.com/Homebrew/homebrew-core/pull/2813
FISH_TRY_CREATE_DIRS(${rel_datadir}/pkgconfig)
FISH_TRY_CREATE_DIRS(${extra_completionsdir} ${extra_functionsdir} ${extra_confdir}) FISH_TRY_CREATE_DIRS(${extra_completionsdir} ${extra_functionsdir} ${extra_confdir})
# @echo "Installing pkgconfig file" # @echo "Installing pkgconfig file"