summarylogtreecommitdiffstats
path: root/far2l_install.patch
diff options
context:
space:
mode:
Diffstat (limited to 'far2l_install.patch')
-rw-r--r--far2l_install.patch20
1 files changed, 2 insertions, 18 deletions
diff --git a/far2l_install.patch b/far2l_install.patch
index d22be01ae8a6..def307b5ffee 100644
--- a/far2l_install.patch
+++ b/far2l_install.patch
@@ -8,8 +8,8 @@ index 7213211..3aa507d 100644
else()
- install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/DE/icons" DESTINATION "/usr/share" USE_SOURCE_PERMISSIONS FILES_MATCHING PATTERN "*")
- install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/DE/far2l.desktop" DESTINATION "/usr/share/applications")
-+ install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/DE/icons" DESTINATION "${CMAKE_INSTALL_PREFIX}/usr/share" USE_SOURCE_PERMISSIONS FILES_MATCHING PATTERN "*")
-+ install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/DE/far2l.desktop" DESTINATION "${CMAKE_INSTALL_PREFIX}/usr/share/applications")
++ install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/DE/icons" DESTINATION "${CMAKE_INSTALL_PREFIX}/share" USE_SOURCE_PERMISSIONS FILES_MATCHING PATTERN "*")
++ install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/DE/far2l.desktop" DESTINATION "${CMAKE_INSTALL_PREFIX}/share/applications")
endif()
[mmozeiko@BHQKCX1 far2l]$ git diff CMakeLists.txt far2l/CMakeLists.txt
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -25,19 +25,3 @@ index 4ca2753..52d1442 100644
set(CMAKE_INSTALL_PREFIX "/usr")
-#endif()
+endif()
-
-
-
-diff --git a/far2l/CMakeLists.txt b/far2l/CMakeLists.txt
-index 7213211..3aa507d 100644
---- a/far2l/CMakeLists.txt
-+++ b/far2l/CMakeLists.txt
-@@ -187,6 +187,6 @@ add_custom_command(TARGET far2l POST_BUILD
- if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
- #TODO
- else()
-- install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/DE/icons" DESTINATION "/usr/share" USE_SOURCE_PERMISSIONS FILES_MATCHING PATTERN "*")
-- install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/DE/far2l.desktop" DESTINATION "/usr/share/applications")
-+ install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/DE/icons" DESTINATION "${CMAKE_INSTALL_PREFIX}/usr/share" USE_SOURCE_PERMISSIONS FILES_MATCHING PATTERN "*")
-+ install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/DE/far2l.desktop" DESTINATION "${CMAKE_INSTALL_PREFIX}/usr/share/applications")
- endif()