[arch-commits] Commit in tinyxml2/trunk (PKGBUILD)

[Alexander Rødseth]

    Date: Sunday, November 11, 2018 @ 16:19:07
  Author: arodseth
Revision: 406374

upgpkg: tinyxml2 7.0.0-2

Modified:
  tinyxml2/trunk/PKGBUILD

----------+
 PKGBUILD |   26 +++++++++++---------------
 1 file changed, 11 insertions(+), 15 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-11-11 15:01:03 UTC (rev 406373)
+++ PKGBUILD	2018-11-11 16:19:07 UTC (rev 406374)
@@ -1,30 +1,29 @@
-# Maintainer: Alexander F Rødseth <xyproto at archlinux.org>
+# Maintainer: Alexander F. Rødseth <xyproto at archlinux.org>
 # Maintainer: Jaroslav Lichtblau <svetlemodry at archlinux.org>
 # Contributor: dhead666 <myfoolishgames at gmail.com>
 
 pkgname=tinyxml2
 pkgver=7.0.0
-pkgrel=1
+pkgrel=2
 pkgdesc='Simple XML parser made for easy integration'
 arch=('x86_64')
 url='http://www.grinninglizard.com/tinyxml2'
 license=('zlib')
-makedepends=('cmake' 'ninja')
+makedepends=('cmake' 'ninja' 'setconf')
 source=($pkgname-$pkgver.tar.gz::https://github.com/leethomason/$pkgname/archive/$pkgver.tar.gz)
 sha256sums=('fa0d1c745d65d4d833e62cb183e23c2034dc7a35ec1a4977e808bdebb9b4fe60')
 
 prepare() {
-  cd "${srcdir}"/$pkgname-$pkgver
-
-  grep License -A20 readme.md > LICENSE
+  grep License -A20 "$pkgname-$pkgver/readme.md" > LICENSE
+  # FS#60757
+  setconf "$pkgname-$pkgver/$pkgname.pc.in" includedir='${prefix}/include'
+  setconf "$pkgname-$pkgver/$pkgname.pc.in" libdir='${prefix}/lib'
 }
 
 build() {
-  cd "${srcdir}"/$pkgname-$pkgver
-
-  install -d build
+  mkdir -p build
   cd build
-  cmake .. \
+  cmake "../$pkgname-$pkgver" \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_INSTALL_LIBDIR=lib \
     -DCMAKE_BUILD_TYPE=Release \
@@ -33,11 +32,8 @@
 }
 
 package() {
-  cd "${srcdir}"/$pkgname-$pkgver
-
-  DESTDIR="${pkgdir}" ninja -C build install
-  cat LICENSE
-  install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/$pkgname/LICENSE
+  DESTDIR="$pkgdir" ninja -C build install
+  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
 
 # getver: github.com/leethomason/tinyxml2