From f6460d6e954b7e751a74b0d376be9b2d8a237bc0 Mon Sep 17 00:00:00 2001
From: Olivier MEDOC <o_medoc@yahoo.fr>
Date: Tue, 6 Jan 2015 15:29:20 +0100
Subject: [PATCH] archlinux: fix new packaging requirements related to run,
 sbin, lib64...

---
 Makefile           | 10 ++++++----
 archlinux/PKGBUILD |  6 +++---
 qmemman/Makefile   |  4 +++-
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index 5dd41c5..a8d27ab 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,9 @@
-ifeq ($(shell uname -m),x86_64)
-LIBDIR = /usr/lib64
-else
-LIBDIR = /usr/lib
+ifndef LIBDIR
+  ifeq ($(shell uname -m),x86_64)
+  LIBDIR = /usr/lib64
+  else
+  LIBDIR = /usr/lib
+  endif
 endif
 INCLUDEDIR = /usr/include
 
diff --git a/archlinux/PKGBUILD b/archlinux/PKGBUILD
index f01a957..57f5efb 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=8
+pkgrel=9
 epoch=
 pkgdesc="Common Linux files for Qubes VM."
 arch=("x86_64")
@@ -37,13 +37,13 @@ for source in qrexec-lib udev qmemman core Makefile; do
   (ln -s $srcdir/../$source $srcdir/$source)
 done
 
-make all
+make all LIBDIR=/usr/lib SBINDIR=/usr/bin
 
 }
 
 package() {
 
-make install DESTDIR=$pkgdir
+make install DESTDIR=$pkgdir LIBDIR=/usr/lib SBINDIR=/usr/bin
 
 }
 
diff --git a/qmemman/Makefile b/qmemman/Makefile
index 6cdae22..5747414 100644
--- a/qmemman/Makefile
+++ b/qmemman/Makefile
@@ -1,5 +1,7 @@
 CC=gcc
 CFLAGS=-Wall -Wextra -Werror -g -O3
+SBINDIR ?= /usr/sbin
+
 all:	meminfo-writer
 
 _XENSTORE_H=$(shell ls /usr/include/xenstore.h)
@@ -10,7 +12,7 @@ endif
 meminfo-writer: meminfo-writer.o
 	$(CC) -g -o meminfo-writer meminfo-writer.o -lxenstore
 install:
-	install -D meminfo-writer $(DESTDIR)/usr/sbin/meminfo-writer
+	install -D meminfo-writer $(DESTDIR)$(SBINDIR)/meminfo-writer
 ifeq (1,${DEBIANBUILD})
 	install -d $(DESTDIR)/lib/systemd/system/
 	install -m 0644 qubes-meminfo-writer.service $(DESTDIR)/lib/systemd/system/