From 9ee8281ab7b7f3977cf7dab7e98f10e25fc42118 Mon Sep 17 00:00:00 2001 From: Olivier MEDOC Date: Wed, 8 Jul 2015 14:33:48 +0200 Subject: [PATCH] archlinux: ensure /usr/sbin is not use to follow archlinux packaging guidelines --- archlinux/PKGBUILD | 2 +- qmemman/Makefile | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/archlinux/PKGBUILD b/archlinux/PKGBUILD index 95bdf5e..e918ec4 100644 --- a/archlinux/PKGBUILD +++ b/archlinux/PKGBUILD @@ -43,7 +43,7 @@ make all package() { -make install DESTDIR=$pkgdir LIBDIR=/usr/lib +make install DESTDIR=$pkgdir LIBDIR=/usr/lib SBINDIR=/usr/bin } diff --git a/qmemman/Makefile b/qmemman/Makefile index 8b17eb3..7273268 100644 --- a/qmemman/Makefile +++ b/qmemman/Makefile @@ -1,6 +1,7 @@ CC=gcc CFLAGS=-Wall -Wextra -Werror -g -O3 all: meminfo-writer +SBINDIR?=/usr/sbin _XENSTORE_H=$(shell ls /usr/include/xenstore.h) ifneq "$(_XENSTORE_H)" "" @@ -10,7 +11,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/