From e23cbbc261267219a4e9fc55d5366357ca668a62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Wed, 6 Jan 2016 04:21:19 +0100 Subject: [PATCH] Fix building Fedora package after Archlinux build fixes LIBDIR on Fedora is /usr/lib64, not something that we want for scripts, Also make sure to export SYSLIBDIR. --- Makefile | 3 ++- udev/Makefile | 12 ++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 47334b5..050b9db 100644 --- a/Makefile +++ b/Makefile @@ -3,10 +3,11 @@ LIBDIR ?= /usr/lib64 else LIBDIR ?= /usr/lib endif +SCRIPTSDIR ?= /usr/lib/qubes SYSLIBDIR ?= /lib INCLUDEDIR ?= /usr/include -export LIBDIR INCLUDEDIR +export LIBDIR SCRIPTSDIR SYSLIBDIR INCLUDEDIR help: echo "Use rpmbuild to compile this pacakge" diff --git a/udev/Makefile b/udev/Makefile index a85b128..a2cf288 100644 --- a/udev/Makefile +++ b/udev/Makefile @@ -6,9 +6,9 @@ install: 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 - mkdir -p $(DESTDIR)$(LIBDIR)/qubes - cp udev-block-add-change $(DESTDIR)$(LIBDIR)/qubes/ - cp udev-block-remove $(DESTDIR)$(LIBDIR)/qubes/ - cp udev-block-cleanup $(DESTDIR)$(LIBDIR)/qubes/ - cp udev-usb-add-change $(DESTDIR)$(LIBDIR)/qubes/ - cp udev-usb-remove $(DESTDIR)$(LIBDIR)/qubes/ + mkdir -p $(DESTDIR)$(SCRIPTSDIR) + cp udev-block-add-change $(DESTDIR)$(SCRIPTSDIR) + cp udev-block-remove $(DESTDIR)$(SCRIPTSDIR) + cp udev-block-cleanup $(DESTDIR)$(SCRIPTSDIR) + cp udev-usb-add-change $(DESTDIR)$(SCRIPTSDIR) + cp udev-usb-remove $(DESTDIR)$(SCRIPTSDIR)