diff options
| author | Martins Mozeiko | 2016-12-14 02:47:43 +0200 |
|---|---|---|
| committer | Martins Mozeiko | 2016-12-14 02:47:43 +0200 |
| commit | e9b5cac536eeb909d34268de53b75ee4b4b3588a (patch) | |
| tree | 46475dac5268658d82d9da8ed04e5287712e98db | |
| parent | db7b7c0838eb5510372f8010afb712d23207b056 (diff) | |
| download | aur-e9b5cac536eeb909d34268de53b75ee4b4b3588a.tar.gz | |
fix for install location
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rw-r--r-- | PKGBUILD | 6 | ||||
| -rw-r--r-- | far2l_install.patch | 20 |
3 files changed, 7 insertions, 23 deletions
@@ -1,7 +1,7 @@ pkgbase = far2l-git pkgdesc = Linux port of FAR v2 pkgver = r680.c87ad2f - pkgrel = 1 + pkgrel = 2 url = https://github.com/elfmz/far2l arch = i686 arch = x86_64 @@ -12,7 +12,7 @@ pkgbase = far2l-git source = git+https://github.com/elfmz/far2l source = far2l_install.patch sha256sums = SKIP - sha256sums = 998bd4aaf0c316e1fd7da15c78ef8460b75a0122d33ae1a23e79da963c9ff854 + sha256sums = 22ed1b899a2855afd4adb8e1cb81703dd56ade20e6449f893181232999b4cab4 pkgname = far2l-git @@ -2,7 +2,7 @@ pkgname=far2l-git pkgver=r680.c87ad2f -pkgrel=1 +pkgrel=2 pkgdesc='Linux port of FAR v2' url='https://github.com/elfmz/far2l' arch=('i686' 'x86_64') @@ -10,7 +10,7 @@ license=('GPL2') source=('git+https://github.com/elfmz/far2l' 'far2l_install.patch') sha256sums=('SKIP' - '998bd4aaf0c316e1fd7da15c78ef8460b75a0122d33ae1a23e79da963c9ff854') + '22ed1b899a2855afd4adb8e1cb81703dd56ade20e6449f893181232999b4cab4') makedepends=('git' 'cmake') depends=('wxgtk') @@ -32,4 +32,4 @@ package() { cmake --build . make install -}
\ No newline at end of file +} 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() |