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

Fix build (installation) on Archlinux

Browse Source 
/lib is a symlink to /usr/lib on Arch, so /lib/blah... paths are
rejected when installation is attempted.
This commit is contained in:
pqg 2015-12-15 14:19:21 +00:00
parent 4dc959e94f
commit 86e7f7c2c8
3 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@ -3,6 +3,7 @@ LIBDIR ?= /usr/lib64
else else
LIBDIR ?= /usr/lib LIBDIR ?= /usr/lib
endif endif
SYSLIBDIR ?= /lib
INCLUDEDIR ?= /usr/include INCLUDEDIR ?= /usr/include
export LIBDIR INCLUDEDIR export LIBDIR INCLUDEDIR

4
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=2 pkgrel=3
epoch= epoch=
pkgdesc="Common Linux files for Qubes VM." pkgdesc="Common Linux files for Qubes VM."
arch=("x86_64") arch=("x86_64")
@ -43,7 +43,7 @@ make all
package() { package() {
make install DESTDIR=$pkgdir LIBDIR=/usr/lib SBINDIR=/usr/bin make install DESTDIR=$pkgdir LIBDIR=/usr/lib SYSLIBDIR=/usr/lib SBINDIR=/usr/bin
} }

20
udev/Makefile
View File

@ -1,14 +1,14 @@
all: all:
install: install:
mkdir -p $(DESTDIR)/lib/udev/rules.d mkdir -p $(DESTDIR)$(SYSLIBDIR)/udev/rules.d
cp udev-qubes-block.rules $(DESTDIR)/lib/udev/rules.d/99-qubes-block.rules cp udev-qubes-block.rules $(DESTDIR)$(SYSLIBDIR)/udev/rules.d/99-qubes-block.rules
cp udev-qubes-usb.rules $(DESTDIR)/lib/udev/rules.d/99-qubes-usb.rules cp udev-qubes-usb.rules $(DESTDIR)$(SYSLIBDIR)/udev/rules.d/99-qubes-usb.rules
cp udev-qubes-misc.rules $(DESTDIR)/lib/udev/rules.d/99-qubes-misc.rules cp udev-qubes-misc.rules $(DESTDIR)$(SYSLIBDIR)/udev/rules.d/99-qubes-misc.rules
mkdir -p $(DESTDIR)/usr/lib/qubes mkdir -p $(DESTDIR)$(LIBDIR)/qubes
cp udev-block-add-change $(DESTDIR)/usr/lib/qubes/ cp udev-block-add-change $(DESTDIR)$(LIBDIR)/qubes/
cp udev-block-remove $(DESTDIR)/usr/lib/qubes/ cp udev-block-remove $(DESTDIR)$(LIBDIR)/qubes/
cp udev-block-cleanup $(DESTDIR)/usr/lib/qubes/ cp udev-block-cleanup $(DESTDIR)$(LIBDIR)/qubes/
cp udev-usb-add-change $(DESTDIR)/usr/lib/qubes/ cp udev-usb-add-change $(DESTDIR)$(LIBDIR)/qubes/
cp udev-usb-remove $(DESTDIR)/usr/lib/qubes/ cp udev-usb-remove $(DESTDIR)$(LIBDIR)/qubes/