improved build

2 files changed, 16 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 99e73215da28..028a0e93cff9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = iconthemebrowser
 	pkgdesc = A small application to browse icon themes available in Qt
 	pkgver = 1.1.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/Skycoder42/IconThemeBrowser
 	arch = i686
 	arch = x86_64
diff --git a/PKGBUILD b/PKGBUILD
index d5c97f179e1e..98e487fd062d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Felix Barz <skycoder42.de@gmx.de>
 pkgname=iconthemebrowser
 pkgver=1.1.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A small application to browse icon themes available in Qt"
 arch=('i686' 'x86_64')
 url="https://github.com/Skycoder42/IconThemeBrowser"
@@ -10,23 +10,29 @@ depends=('qt5-base' 'qt5-tools')
 makedepends=('git' 'qpm')
 optdepends=('qt5-imageformats: Support for additional icon types'
             'qt5-svg: Support for SVG-Icons')
-source=("$pkgname-$pkgver::git+https://github.com/Skycoder42/IconThemeBrowser.git#tag=$pkgver")
+_pkgfqn=$pkgname-$pkgver
+source=("$_pkgfqn::git+https://github.com/Skycoder42/IconThemeBrowser.git#tag=$pkgver")
 md5sums=('SKIP')
 
-build() {
-  cd "$pkgname-$pkgver"
+prepare() {
+  mkdir -p build
+
+  cd "$_pkgfqn"
   qpm install
+}
 
-  qmake
-  make qmake_all
+build() {
+  cd build
+
+  qmake -r "../$_pkgfqn/"
   make
 }
 
 package() {
-  cd "$pkgname-$pkgver"
-
+  cd build
   make INSTALL_ROOT="$pkgdir" install
-  
+
+  cd "../$_pkgfqn"
   install -D -m644 de.skycoder42.${pkgname}.desktop "$pkgdir/usr/share/applications/de.skycoder42.${pkgname}.desktop"
   install -D -m644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }