From 86e7f7c2c88ba68ce1e51c03ecf055d830661122 Mon Sep 17 00:00:00 2001
From: pqg <pqg@riseup.net>
Date: Tue, 15 Dec 2015 14:19:21 +0000
Subject: [PATCH] Fix build (installation) on Archlinux

/lib is a symlink to /usr/lib on Arch, so /lib/blah... paths are
rejected when installation is attempted.
---
 Makefile           |  1 +
 archlinux/PKGBUILD |  4 ++--
 udev/Makefile      | 20 ++++++++++----------
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/Makefile b/Makefile
index 6d86c27..47334b5 100644
--- a/Makefile
+++ b/Makefile
@@ -3,6 +3,7 @@ LIBDIR ?= /usr/lib64
 else
 LIBDIR ?= /usr/lib
 endif
+SYSLIBDIR ?= /lib
 INCLUDEDIR ?= /usr/include
 
 export LIBDIR INCLUDEDIR
diff --git a/archlinux/PKGBUILD b/archlinux/PKGBUILD
index e918ec4..05f9b97 100644
--- a/archlinux/PKGBUILD
+++ b/archlinux/PKGBUILD
@@ -6,7 +6,7 @@
 # Maintainer: Olivier Medoc <o_medoc@yahoo.fr>
 pkgname=qubes-vm-utils
 pkgver=`cat version`
-pkgrel=2
+pkgrel=3
 epoch=
 pkgdesc="Common Linux files for Qubes VM."
 arch=("x86_64")
@@ -43,7 +43,7 @@ make all
 
 package() {
 
-make install DESTDIR=$pkgdir LIBDIR=/usr/lib SBINDIR=/usr/bin
+make install DESTDIR=$pkgdir LIBDIR=/usr/lib SYSLIBDIR=/usr/lib SBINDIR=/usr/bin
 
 }
 
diff --git a/udev/Makefile b/udev/Makefile
index 0781c27..a85b128 100644
--- a/udev/Makefile
+++ b/udev/Makefile
@@ -1,14 +1,14 @@
 all:
 
 install:
-	mkdir -p $(DESTDIR)/lib/udev/rules.d
-	cp udev-qubes-block.rules $(DESTDIR)/lib/udev/rules.d/99-qubes-block.rules
-	cp udev-qubes-usb.rules $(DESTDIR)/lib/udev/rules.d/99-qubes-usb.rules
-	cp udev-qubes-misc.rules $(DESTDIR)/lib/udev/rules.d/99-qubes-misc.rules
+	mkdir -p $(DESTDIR)$(SYSLIBDIR)/udev/rules.d
+	cp udev-qubes-block.rules $(DESTDIR)$(SYSLIBDIR)/udev/rules.d/99-qubes-block.rules
+	cp udev-qubes-usb.rules $(DESTDIR)$(SYSLIBDIR)/udev/rules.d/99-qubes-usb.rules
+	cp udev-qubes-misc.rules $(DESTDIR)$(SYSLIBDIR)/udev/rules.d/99-qubes-misc.rules
 
-	mkdir -p $(DESTDIR)/usr/lib/qubes
-	cp udev-block-add-change $(DESTDIR)/usr/lib/qubes/
-	cp udev-block-remove $(DESTDIR)/usr/lib/qubes/
-	cp udev-block-cleanup $(DESTDIR)/usr/lib/qubes/
-	cp udev-usb-add-change $(DESTDIR)/usr/lib/qubes/
-	cp udev-usb-remove $(DESTDIR)/usr/lib/qubes/
+	mkdir -p $(DESTDIR)$(LIBDIR)/qubes
+	cp udev-block-add-change $(DESTDIR)$(LIBDIR)/qubes/
+	cp udev-block-remove $(DESTDIR)$(LIBDIR)/qubes/
+	cp udev-block-cleanup $(DESTDIR)$(LIBDIR)/qubes/
+	cp udev-usb-add-change $(DESTDIR)$(LIBDIR)/qubes/
+	cp udev-usb-remove $(DESTDIR)$(LIBDIR)/qubes/