From 7a2e8c6fc31e5b8fd6a05e22e88d58ed88188652 Mon Sep 17 00:00:00 2001 From: Martin Brodbeck Date: Fri, 12 Apr 2019 12:48:33 +0200 Subject: [PATCH 1/2] install prefix fixed --- misc/PKGBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/misc/PKGBUILD b/misc/PKGBUILD index 8681fc0..af5389c 100644 --- a/misc/PKGBUILD +++ b/misc/PKGBUILD @@ -1,6 +1,6 @@ # Maintainer: Martin Brodbeck pkgname=kima2 -pkgver=0.13.0 +pkgver=1.1.0 pkgrel=1 pkgdesc="A small cash point program for children's things markets (German only)" arch=('i686' 'x86_64') @@ -17,13 +17,13 @@ build() { fi cd $pkgname/build - cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$pkgdir/usr -DKIMA2_USE_EXTERNAL_JSON=ON .. + cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr -DKIMA2_USE_EXTERNAL_JSON=ON .. make } package() { cd $pkgname/build - make install + make DESTDIR="$pkgdir" install cd .. install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } From d2680c52af509e5c7de7a773469fea3611ccbcde Mon Sep 17 00:00:00 2001 From: Martin Brodbeck Date: Fri, 12 Apr 2019 12:49:09 +0200 Subject: [PATCH 2/2] cmake module path simplified --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index dd73cac..252b1f0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.8) project(kima2 VERSION 1.1.0) -set(CMAKE_MODULE_PATH "${CMAKE_HOME_DIRECTORY}/cmake" ${CMAKE_MODULE_PATH}) +set(CMAKE_MODULE_PATH "${CMAKE_HOME_DIRECTORY}/cmake") set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON)