From de0b4b73f7c4d975326ac9b46671bdfbba81c869 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Sun, 15 Mar 2015 01:53:03 +0100 Subject: [PATCH] qrexec: move qrexec-client-vm to /usr/bin --- qrexec/Makefile | 6 ++++-- rpm_spec/core-vm.spec | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/qrexec/Makefile b/qrexec/Makefile index 49f1857..054677b 100644 --- a/qrexec/Makefile +++ b/qrexec/Makefile @@ -18,8 +18,10 @@ clean: install: install -d $(DESTDIR)/etc/qubes-rpc install -d $(DESTDIR)/usr/lib/qubes + install -d $(DESTDIR)/usr/bin install qrexec-agent $(DESTDIR)/usr/lib/qubes - install qrexec-client-vm $(DESTDIR)/usr/lib/qubes - ln -s qrexec-client-vm $(DESTDIR)/usr/lib/qubes/qrexec_client_vm + install qrexec-client-vm $(DESTDIR)/usr/bin + ln -s ../../bin/qrexec-client-vm $(DESTDIR)/usr/lib/qubes/qrexec-client-vm + ln -s ../../bin/qrexec-client-vm $(DESTDIR)/usr/lib/qubes/qrexec_client_vm install qubes-rpc-multiplexer $(DESTDIR)/usr/lib/qubes diff --git a/rpm_spec/core-vm.spec b/rpm_spec/core-vm.spec index a67065a..686aadc 100644 --- a/rpm_spec/core-vm.spec +++ b/rpm_spec/core-vm.spec @@ -396,6 +396,7 @@ rm -f %{name}-%{version} /usr/bin/qvm-mru-entry /usr/bin/xenstore-watch-qubes /usr/bin/qubes-desktop-run +/usr/bin/qrexec-client-vm %dir /usr/lib/qubes /usr/lib/qubes/vusb-ctl.py* /usr/lib/qubes/dispvm-prerun.sh