From: Ivailo Monev Date: Tue, 3 May 2016 17:01:32 +0000 (+0000) Subject: disable installation of bootstrapped Katie X-Git-Tag: 4.12.0~7326 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=deb1a40c42368228100f79ccd8cc37b1b7e13819;p=kde%2FKatie.git disable installation of bootstrapped Katie Signed-off-by: Ivailo Monev --- diff --git a/cmake/modules/KatieBuildMacros.cmake b/cmake/modules/KatieBuildMacros.cmake index 91961ae93..52c1acf19 100644 --- a/cmake/modules/KatieBuildMacros.cmake +++ b/cmake/modules/KatieBuildMacros.cmake @@ -9,6 +9,7 @@ if(CMAKE_CROSSCOMPILING) GIT_REPOSITORY https://github.com/fluxer/katie SOURCE_DIR ${CMAKE_BINARY_DIR}/external_katie BUILD_IN_SOURCE 1 + INSTALL_COMMAND "" # disable installation UPDATE_DISCONNECTED 1 # it always fails CMAKE_ARGS -DKATIE_BOOTSTRAP=TRUE -Wno-dev ) diff --git a/package/archlinux-mingw/PKGBUILD b/package/archlinux-mingw/PKGBUILD index 2b773b57d..c8f394f89 100644 --- a/package/archlinux-mingw/PKGBUILD +++ b/package/archlinux-mingw/PKGBUILD @@ -44,8 +44,4 @@ package() { install -vDm644 ../katie/LGPL_EXCEPTION.txt \ "${pkgdir}/usr/share/licenses/mingw-w64-katie-git/LGPL_EXCEPTION.txt" - - # bootstrap files, they should not be installed and this should be fixed - # in Katie itself - rm -rf "${pkgdir}/usr/local" "${pkgdir}/usr/share" }