Fix directory name clash by building in _build

2 files changed, 9 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d8bd474fb9af..abc2d1ff54b2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = treesheets-git
 	pkgdesc = The ultimate replacement for spreadsheets, mind mappers, outliners, PIMs, text editors and small databases
-	pkgver = r297.7c4ad33
+	pkgver = r341.ae6506a
 	pkgrel = 1
 	url = http://treesheets.com
 	arch = i686
@@ -12,10 +12,9 @@ pkgbase = treesheets-git
 	makedepends = cmake
 	makedepends = git
 	depends = wxgtk2
-	source = git://github.com/aardappel/treesheets.git
+	source = git+https://github.com/aardappel/treesheets.git
 	source = myframe.patch
 	sha512sums = SKIP
 	sha512sums = 7ea8b6947c334adebba774bcdd4db27670206a216de0c023c2b69aa3ad3b621165733a36f03f2e23bab1e7721982a24c29c4446754ba79c11c5735961ad04816
 
 pkgname = treesheets-git
-
diff --git a/PKGBUILD b/PKGBUILD
index 0e527b5ae9aa..b84b6452f2cf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,9 @@
 # Maintainer: Kevin MacMartin <prurigro at gmail dot com>
+# Maintainer: SanskritFritz (gmail)
 
 _pkgname=treesheets
 pkgname=$_pkgname-git
-pkgver=r297.7c4ad33
+pkgver=r341.ae6506a
 pkgrel=1
 pkgdesc='The ultimate replacement for spreadsheets, mind mappers, outliners, PIMs, text editors and small databases'
 url='http://treesheets.com'
@@ -12,7 +13,7 @@ makedepends=('cmake' 'git')
 arch=('i686' 'x86_64' 'arm' 'armv6h' 'armv7h')
 
 source=(
-  "git://github.com/aardappel/$_pkgname.git"
+  "git+https://github.com/aardappel/$_pkgname.git"
   'myframe.patch'
 )
 
@@ -34,19 +35,20 @@ prepare() {
 
 build() {
   cd $_pkgname
-  cmake -DCMAKE_BUILD_TYPE=Release
+  cmake -S . -B _build -DCMAKE_BUILD_TYPE=Release
+  cd _build
   make
 }
 
 package() {
   cd $_pkgname
   install -Dm644 ZLIB_LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+  install -dm755 "$pkgdir/usr/share/applications"
+  install -Dm755 _build/$_pkgname "$pkgdir/usr/bin/$_pkgname"
 
   cd TS
-  install -dm755 "$pkgdir/usr/share/applications"
   sed 's|Icon=images/|Icon=|' $_pkgname.desktop > "$pkgdir/usr/share/applications/$_pkgname.desktop"
   install -Dm644 images/$_pkgname.svg "$pkgdir/usr/share/pixmaps/$_pkgname.svg"
-  install -Dm755 $_pkgname "$pkgdir/usr/bin/$_pkgname"
 
   install -dm755 "$pkgdir/usr/share/$_pkgname"
   cp -R scripts "$pkgdir/usr/share/$_pkgname/scripts"