[bugfix] install install paths

Use CMake's installer instead of doing your own thing. That way it's
guranteed that no mess-ups occur.

2 files changed, 8 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 560868332417..071acfa9b66e 100755
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = xava-git
 	pkgdesc = X11 Audio Visualizer for Alsa/Pulseaudio/FIFO
-	pkgver = 0.7.0.0.r147.g71db641
+	pkgver = 0.6.3.1.r263.gb8ec4f4
 	pkgrel = 1
 	url = https://github.com/nikp123/xava
 	arch = any
@@ -19,4 +19,3 @@ pkgbase = xava-git
 	sha1sums = SKIP
 
 pkgname = xava-git
-
diff --git a/PKGBUILD b/PKGBUILD
index c90fddc258ca..c78f9b39e8b6 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=xava-git
 _pkgname=xava
-pkgver=0.6.3.1.r147.g71db641
+pkgver=0.6.3.1.r263.gb8ec4f4
 pkgrel=1
 pkgdesc='X11 Audio Visualizer for Alsa/Pulseaudio/FIFO'
 arch=('any')
@@ -12,28 +12,23 @@ source=('git+https://github.com/nikp123/xava')
 sha1sums=('SKIP')
 
 pkgver() {
-	cd ${srcdir}/${_pkgname}
-	git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
+  cd ${srcdir}/${_pkgname}
+  git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 build() {
   mkdir -p $_pkgname/build
   cd $_pkgname/build
-  cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX:PATH=/usr ..
+  cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX:PATH="$pkgdir"/usr ..
   make
 }
 
 package() {
   cd $_pkgname
-  install -Dm755 build/"$_pkgname" "$pkgdir/usr/bin/$_pkgname"
+
+  # Install binaries
   cd build
-  for i in filter*.so out*.so in*.so; do
-    install -Dm755 $i "$pkgdir/usr/lib/xava/$i"
-  done
+    make install
   cd ..
-  install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$_pkgname/LICENSE
-  install -Dm644 build/"$_pkgname".desktop "$pkgdir"/usr/share/applications/"$_pkgname".desktop
-  install -Dm644 assets/linux/"$_pkgname".svg "$pkgdir"/usr/share/icons/hicolor/scalable/apps/"$_pkgname".svg
-  install -Dm644 example_files/config "$pkgdir"/usr/share/xava/config.example
 }