update to latest commit and use make install target

2 files changed, 12 insertions, 29 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1119b6f736cd..8bb300f744a5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = simpletools
 	pkgdesc = Handy command line tools for ntuple manipulation and analysis.
-	pkgver = 2.0v.9f97db6
+	pkgver = 2.0v.e574cc8
 	pkgrel = 1
 	url = https://github.com/cofitzpa/simpletools
 	arch = i686
diff --git a/PKGBUILD b/PKGBUILD
index 70b13f8b8d34..1d757c648eba 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Konstantin Gizdov < arch at kge dot pw >
 
 pkgname=simpletools
-pkgver=2.0v.9f97db6
+pkgver=2.0v.e574cc8
 pkgrel=1
 pkgdesc="Handy command line tools for ntuple manipulation and analysis."
 arch=('i686' 'x86_64')
@@ -15,44 +15,27 @@ sha256sums=('SKIP'
             '540b86cd9997926026a5d277c819ae9c348bde7921158a78f3c676c855b6ab5e')
 options=('!emptydirs')
 
-prepare() {
-    cd "${srcdir}/${pkgname}"
+
+package() {
+    # make install target is lost if done in prepare() or build()
+    # do everything here...
     mkdir -p "${srcdir}/${pkgname}/build"
+    install -d "${pkgdir}/usr/lib/"
     cd "${srcdir}/${pkgname}/build"
     msg2 'Configuring...'
     cmake -C "${srcdir}/settings.cmake" "${srcdir}/${pkgname}"
-    # remove wrongly included ELF file
-    rm "${srcdir}/${pkgname}/simpletools_tutorial/core.17423"
-}
-
-build() {
-    cd "${srcdir}/${pkgname}/build"
-    msg2 'Compiling...'
-    make
-}
+    msg2 'Compiling & Installing...'
+    make DESTDIR="${pkgdir}" install
 
-package() {
-    # Package does not define install script
-    msg2 'Installing...'
-    install -d "${pkgdir}/usr/bin/"
-    declare -a bins
-    bins=("${srcdir}/${pkgname}"/build/bin/*)
-    for bin in "${bins[@]}"; do
-        install -Dm755 "${bin}" "${pkgdir}/usr/bin/"
-    done
-    install -d "${pkgdir}/usr/lib/"
-    declare -a libs
-    libs=("${srcdir}/${pkgname}"/build/lib/*)
-    for lib in "${libs[@]}"; do
-        install -Dm755 "${lib}" "${pkgdir}/usr/lib/"
-    done
+    # install tutorials
     install -d "${pkgdir}/usr/share/simpletools/tutorial/"
     declare -a tutorials
     tutorials=("${srcdir}/${pkgname}"/simpletools_tutorial/*)
     for tutorial in "${tutorials[@]}"; do
         install -Dm644 "${tutorial}" "${pkgdir}/usr/share/simpletools/tutorial/"
     done
+
+    # install docs & license
     install -Dm644 "${srcdir}/${pkgname}/LICENSE" "${pkgdir}/usr/share/licenses/simpletools/LICENSE"
-    install -Dm644 "${srcdir}/${pkgname}/README" "${pkgdir}/usr/share/doc/simpletools/README"
     install -Dm644 "${srcdir}/${pkgname}/README.md" "${pkgdir}/usr/share/doc/simpletools/README.md"
 }