From ea08560e4305731d93a696c6d5edf47f8338502e Mon Sep 17 00:00:00 2001
From: Marek Marczykowski <marmarek@invisiblethingslab.com>
Date: Sat, 2 Jun 2012 12:32:49 +0200
Subject: [PATCH] makefile: rename vchan Makefile to not conflict with windows
build
---
rpm_spec/core-dom0.spec | 2 +-
rpm_spec/core-vm.spec | 2 +-
vchan/{Makefile => Makefile.linux} | 0
3 files changed, 2 insertions(+), 2 deletions(-)
rename vchan/{Makefile => Makefile.linux} (100%)
diff --git a/rpm_spec/core-dom0.spec b/rpm_spec/core-dom0.spec
index 5994aebd..e9c3cd67 100644
--- a/rpm_spec/core-dom0.spec
+++ b/rpm_spec/core-dom0.spec
@@ -54,7 +54,7 @@ python -O -m compileall qvm-core qmemman
make -C restore
make -C aux-tools
make -C ../qubes_rpc
-make -C ../vchan
+make -C ../vchan -f Makefile.linux
make -C ../u2mfn
make -C ../qrexec
diff --git a/rpm_spec/core-vm.spec b/rpm_spec/core-vm.spec
index 06004ea5..88b26870 100644
--- a/rpm_spec/core-vm.spec
+++ b/rpm_spec/core-vm.spec
@@ -54,7 +54,7 @@ The Qubes core files for installation inside a Qubes VM.
%build
make -C u2mfn
-make -C vchan
+make -C vchan -f Makefile.linux
make -C misc
make -C qubes_rpc
make -C qrexec
diff --git a/vchan/Makefile b/vchan/Makefile.linux
similarity index 100%
rename from vchan/Makefile
rename to vchan/Makefile.linux