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

Fix building Fedora package after Archlinux build fixes

Browse Source 
LIBDIR on Fedora is /usr/lib64, not something that we want for scripts,
Also make sure to export SYSLIBDIR.
This commit is contained in:
Marek Marczykowski-Górecki 2016-01-06 04:21:19 +01:00
parent 86e7f7c2c8
commit e23cbbc261
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@ -3,10 +3,11 @@ LIBDIR ?= /usr/lib64
else else
LIBDIR ?= /usr/lib LIBDIR ?= /usr/lib
endif endif
SCRIPTSDIR ?= /usr/lib/qubes
SYSLIBDIR ?= /lib SYSLIBDIR ?= /lib
INCLUDEDIR ?= /usr/include INCLUDEDIR ?= /usr/include
export LIBDIR INCLUDEDIR export LIBDIR SCRIPTSDIR SYSLIBDIR INCLUDEDIR
help: help:
echo "Use rpmbuild to compile this pacakge" echo "Use rpmbuild to compile this pacakge"

12
udev/Makefile
View File

@ -6,9 +6,9 @@ install:
cp udev-qubes-usb.rules $(DESTDIR)$(SYSLIBDIR)/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)$(SYSLIBDIR)/udev/rules.d/99-qubes-misc.rules cp udev-qubes-misc.rules $(DESTDIR)$(SYSLIBDIR)/udev/rules.d/99-qubes-misc.rules
mkdir -p $(DESTDIR)$(LIBDIR)/qubes mkdir -p $(DESTDIR)$(SCRIPTSDIR)
cp udev-block-add-change $(DESTDIR)$(LIBDIR)/qubes/ cp udev-block-add-change $(DESTDIR)$(SCRIPTSDIR)
cp udev-block-remove $(DESTDIR)$(LIBDIR)/qubes/ cp udev-block-remove $(DESTDIR)$(SCRIPTSDIR)
cp udev-block-cleanup $(DESTDIR)$(LIBDIR)/qubes/ cp udev-block-cleanup $(DESTDIR)$(SCRIPTSDIR)
cp udev-usb-add-change $(DESTDIR)$(LIBDIR)/qubes/ cp udev-usb-add-change $(DESTDIR)$(SCRIPTSDIR)
cp udev-usb-remove $(DESTDIR)$(LIBDIR)/qubes/ cp udev-usb-remove $(DESTDIR)$(SCRIPTSDIR)