diff options
author | Avi Kivity <avi@qumranet.com> | 2006-11-09 15:56:49 +0000 |
---|---|---|
committer | Avi Kivity <avi@qumranet.com> | 2006-11-09 15:56:49 +0000 |
commit | c19024f59fcf4493db16b88e61f994f3fc83b5ad (patch) | |
tree | 2cb04f86875e50a5c5d511e88573c2384770eef4 /kvm/Makefile | |
parent | kvm: web: recent binutils no longer needed (diff) | |
download | qemu-kvm-c19024f59fcf4493db16b88e61f994f3fc83b5ad.tar.gz qemu-kvm-c19024f59fcf4493db16b88e61f994f3fc83b5ad.tar.bz2 qemu-kvm-c19024f59fcf4493db16b88e61f994f3fc83b5ad.zip |
kvm: merge from kernel release branch (revs 3567, 3568, 3577, 3579, 3580, 3582, 3582-5)
Diffstat (limited to 'kvm/Makefile')
-rw-r--r-- | kvm/Makefile | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/kvm/Makefile b/kvm/Makefile index a5fe63c24..9b242004e 100644 --- a/kvm/Makefile +++ b/kvm/Makefile @@ -1,11 +1,12 @@ +include config.mak -DESTDIR = +DESTDIR= rpmrelease = devel .PHONY: kernel user qemu clean -all: kernel user qemu +all: $(if $(WANT_MODULE), kernel) user qemu qemu kernel user: $(MAKE) -C $@ @@ -23,7 +24,7 @@ initdir = /etc/init.d confdir = /etc/kvm utilsdir = /etc/kvm/utils -install: +install-rpm: mkdir -p $(DESTDIR)/$(bindir) mkdir -p $(DESTDIR)/$(confdir) mkdir -p $(DESTDIR)/$(initdir) @@ -33,6 +34,10 @@ install: cp scripts/qemu-ifup $(DESTDIR)/$(confdir)/qemu-ifup cp kvm $(DESTDIR)/$(utilsdir)/kvm +install: + make -C user DESTDIR="$(DESTDIR)" install + make -C qemu DESTDIR="$(DESTDIR)" install + tmpspec = .tmp.kvm.spec rpm: user qemu |