remove workarounds for package target with bootstrap

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

diff --git a/cmake/modules/KatieBuildMacros.cmake b/cmake/modules/KatieBuildMacros.cmake
index 6608c1c..e79208d 100644 (file)
--- a/cmake/modules/KatieBuildMacros.cmake
+++ b/cmake/modules/KatieBuildMacros.cmake
@@ -8,11 +8,9 @@ if(CMAKE_CROSSCOMPILING)
         external_katie
         GIT_REPOSITORY https://github.com/fluxer/katie
         SOURCE_DIR ${CMAKE_BINARY_DIR}/external_katie
-        INSTALL_DIR ${CMAKE_BINARY_DIR}/external_katie_install
         BUILD_IN_SOURCE 1
         UPDATE_DISCONNECTED 1 # it always fails
         CMAKE_ARGS -DKATIE_BOOTSTRAP=TRUE -Wno-dev
-        CMAKE_CACHE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_BINARY_DIR}/external_katie_install
     )
     # TODO: native executable suffix
     set(KATIE_UIC "${CMAKE_BINARY_DIR}/external_katie/bin/uic")

diff --git a/package/archlinux-mingw/PKGBUILD b/package/archlinux-mingw/PKGBUILD
index aefed13..057dd11 100644 (file)
--- a/package/archlinux-mingw/PKGBUILD
+++ b/package/archlinux-mingw/PKGBUILD
@@ -61,4 +61,8 @@ 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}/local" "${pkgdir}/share"
 }