QubesOS/qubes-linux-utils
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

archlinux: fix new packaging requirements related to run, sbin, lib64...

Browse Source
This commit is contained in:
Olivier MEDOC 2015-01-06 15:29:20 +01:00 committed by Marek Marczykowski-Górecki
parent 034b066700
commit f6460d6e95
3 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile
View File

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

6
archlinux/PKGBUILD
View File

@ -6,7 +6,7 @@
# Maintainer: Olivier Medoc <o_medoc@yahoo.fr> # Maintainer: Olivier Medoc <o_medoc@yahoo.fr>
pkgname=qubes-vm-utils pkgname=qubes-vm-utils
pkgver=`cat version` pkgver=`cat version`
pkgrel=8 pkgrel=9
epoch= epoch=
pkgdesc="Common Linux files for Qubes VM." pkgdesc="Common Linux files for Qubes VM."
arch=("x86_64") arch=("x86_64")
@ -37,13 +37,13 @@ for source in qrexec-lib udev qmemman core Makefile; do
(ln -s $srcdir/../$source $srcdir/$source) (ln -s $srcdir/../$source $srcdir/$source)
done done
make all make all LIBDIR=/usr/lib SBINDIR=/usr/bin
} }
package() { package() {
make install DESTDIR=$pkgdir make install DESTDIR=$pkgdir LIBDIR=/usr/lib SBINDIR=/usr/bin
} }

4
qmemman/Makefile
View File

@ -1,5 +1,7 @@
CC=gcc CC=gcc
CFLAGS=-Wall -Wextra -Werror -g -O3 CFLAGS=-Wall -Wextra -Werror -g -O3
SBINDIR ?= /usr/sbin
all: meminfo-writer all: meminfo-writer
_XENSTORE_H=$(shell ls /usr/include/xenstore.h) _XENSTORE_H=$(shell ls /usr/include/xenstore.h)
@ -10,7 +12,7 @@ endif
meminfo-writer: meminfo-writer.o meminfo-writer: meminfo-writer.o
$(CC) -g -o meminfo-writer meminfo-writer.o -lxenstore $(CC) -g -o meminfo-writer meminfo-writer.o -lxenstore
install: install:
install -D meminfo-writer $(DESTDIR)/usr/sbin/meminfo-writer install -D meminfo-writer $(DESTDIR)$(SBINDIR)/meminfo-writer
ifeq (1,${DEBIANBUILD}) ifeq (1,${DEBIANBUILD})
install -d $(DESTDIR)/lib/systemd/system/ install -d $(DESTDIR)/lib/systemd/system/
install -m 0644 qubes-meminfo-writer.service $(DESTDIR)/lib/systemd/system/ install -m 0644 qubes-meminfo-writer.service $(DESTDIR)/lib/systemd/system/