From e26d5418afa07bfd594570e3e7978c81090606e1 Mon Sep 17 00:00:00 2001 From: Mahmoud Al-Qudsi Date: Thu, 31 May 2018 22:40:29 -0500 Subject: [PATCH] Revert "Blow away existing $fish_data_dir on (re)install" This reverts commit e35983438ef36fef579d8247a515da59cee07d95. Reopens #4314. Closes #5007. # Conflicts: # share/config.fish --- cmake/Install.cmake | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/cmake/Install.cmake b/cmake/Install.cmake index add0b84fb..bd5e0dcd6 100644 --- a/cmake/Install.cmake +++ b/cmake/Install.cmake @@ -59,14 +59,6 @@ FUNCTION(FISH_CREATE_DIRS) ENDFOREACH(dir) ENDFUNCTION(FISH_CREATE_DIRS) -FUNCTION(FISH_TRY_REMOVE) - FOREACH(dir ${ARGV}) - IF(EXISTS ${CMAKE_INSTALL_PREFIX}/${dir}) - FILE(REMOVE_RECURSE ${CMAKE_INSTALL_PREFIX}/${dir}) - ENDIF() - ENDFOREACH() -ENDFUNCTION(FISH_TRY_REMOVE) - FUNCTION(FISH_TRY_CREATE_DIRS) FOREACH(dir ${ARGV}) IF(NOT IS_ABSOLUTE ${dir}) @@ -98,8 +90,6 @@ INSTALL(TARGETS ${PROGRAMS} FISH_CREATE_DIRS(${sysconfdir}/fish/conf.d) INSTALL(FILES etc/config.fish DESTINATION ${sysconfdir}/fish/) -FISH_TRY_REMOVE(${rel_datadir}/fish) - FISH_CREATE_DIRS(${rel_datadir}/fish ${rel_datadir}/fish/completions ${rel_datadir}/fish/functions ${rel_datadir}/fish/groff ${rel_datadir}/fish/man/man1 ${rel_datadir}/fish/tools