archlinux: update to match new dependancies and archlinux /usr/lib guidelines

Makefile

@@ -1,9 +1,9 @@
 ifeq ($(shell uname -m),x86_64)
-LIBDIR = /usr/lib64
+LIBDIR ?= /usr/lib64
 else
-LIBDIR = /usr/lib
+LIBDIR ?= /usr/lib
 endif
-INCLUDEDIR = /usr/include
+INCLUDEDIR ?= /usr/include
 
 export LIBDIR INCLUDEDIR
 

archlinux/PKGBUILD

@@ -6,14 +6,14 @@
 # Maintainer: Olivier Medoc <o_medoc@yahoo.fr>
 pkgname=qubes-vm-utils
 pkgver=`cat version`
-pkgrel=8
+pkgrel=2
 epoch=
 pkgdesc="Common Linux files for Qubes VM."
 arch=("x86_64")
 url="http://qubes-os.org/"
 license=('GPL')
 groups=()
-depends=(qubes-libvchan)
+depends=(qubes-libvchan imagemagick python2-cairo)
 makedepends=(qubes-libvchan)
 checkdepends=()
 optdepends=()
@@ -43,7 +43,7 @@ make all
 
 package() {
 
-make install DESTDIR=$pkgdir
+make install DESTDIR=$pkgdir LIBDIR=/usr/lib
 
 }
 

archlinux/PKGBUILD-qubes-vm-utils.install

@@ -2,13 +2,8 @@
 ## arg 1:  the new package version
 post_install() {
   ldconfig
-  if [ -r /etc/qubes-release ]; then
-      # dom0
-      /bin/systemctl enable qubes-meminfo-writer-dom0.service > /dev/null 2>&1
-  else
-      # VM
-      /bin/systemctl enable qubes-meminfo-writer.service > /dev/null 2>&1
-  fi
+  /bin/systemctl enable qubes-meminfo-writer-dom0.service > /dev/null 2>&1
+  /bin/systemctl enable qubes-meminfo-writer.service > /dev/null 2>&1
 }
 
 post_upgrade() {