summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorAvi Kivity <avi@qumranet.com>2006-11-28 14:55:59 +0000
committerAvi Kivity <avi@qumranet.com>2006-11-28 14:55:59 +0000
commit7af29f642bbf0a3bc19405d6d4d5d6042730368b (patch)
treeee0644dc5c8e12f6bc9dbde65e2285f269ac5028 /Makefile
parentc16d22585405deca05a2f0130b24f5d2a59c70e5 (diff)
kvm: revert r3908 for Makefile, kernel/Makefile
bad merge from amd integration branch
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile9
1 files changed, 3 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index 6617c89d..03c7124e 100644
--- a/Makefile
+++ b/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)