diff options
| author |   Avi Kivity <avi@qumranet.com> | 2006-11-28 14:55:59 +0000 |
|---|---|---|
| committer | Avi Kivity <avi@qumranet.com> | 2006-11-28 14:55:59 +0000 |
| commit | 487c899c6773012d4480645d7a9763dae0c57b84 (patch) | |
| tree | f7a0c6f296fb18310e78eb859ad45a59d77c5771 /kvm/Makefile | |
| parent | qemu migration: removed a printf that sneaked in (diff) | |
| download | qemu-kvm-487c899c6773012d4480645d7a9763dae0c57b84.tar.gz qemu-kvm-487c899c6773012d4480645d7a9763dae0c57b84.tar.bz2 qemu-kvm-487c899c6773012d4480645d7a9763dae0c57b84.zip | |
kvm: revert r3908 for Makefile, kernel/Makefile
bad merge from amd integration branch
Diffstat (limited to 'kvm/Makefile')
| -rw-r--r-- | kvm/Makefile | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/kvm/Makefile b/kvm/Makefile index 6617c89d8..03c7124e4 100644 --- a/kvm/Makefile +++ b/kvm/Makefile @@ -14,11 +14,6 @@ qemu kernel user: qemu: user -clean: - @for d in kernel user qemu; do \ - $(MAKE) -C $$d $@; \ - done - bindir = /usr/bin bin = $(bindir)/kvm initdir = /etc/init.d @@ -40,12 +35,14 @@ install: make -C qemu DESTDIR="$(DESTDIR)" install tmpspec = .tmp.kvm.spec +TARGETDIR=$$(pwd)/../RPMS rpm: user qemu - mkdir -p BUILD RPMS/$$(uname -i) + mkdir -p $(TARGETDIR)/$$(uname -i) sed 's/^Release:.*/Release: $(rpmrelease)/' kvm.spec > $(tmpspec) rpmbuild --define="kverrel $$(uname -r)" \ --define="objdir $$(pwd)" \ + --define="_rpmdir $(TARGETDIR)" \ --define="_topdir $$(pwd)" \ --define="prebuilt 1" \ -bb $(tmpspec) |