X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=Makefile.in;h=89e647450e37f1e11db3ec77e8971d9d2f3a0111;hb=HEAD;hp=f5df4b4c6b59a6cb9ed9c5ec7b32567343c9e0f3;hpb=d2056df9b67dc906882e69f34faac7bc7120f386;p=virt-p2v.git

diff --git a/Makefile.in b/Makefile.in
index f5df4b4..89e6474 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -42,7 +42,7 @@ VIRTP2V_RPM     := $(PACKAGE)-$(VERSION)-1.noarch.rpm
 all:
 	@echo "make rpm       Build the virt-p2v RPM"
 	@echo "make build     Build the live CD ISO"
-	@echo "make boot [HDA=hda.img] [HDB=hdb.img] [ISO=livecd.iso]"
+	@echo "make boot [HDA=hda.img] [HDB=hdb.img] [ISO=livecd.iso] [SERIAL=yes]"
 	@echo "                 Boot built/named ISO (uses qemu)"
 	@echo "make update    Update an existing live CD ISO with new"
 	@echo "                 virt-p2v script, without doing full rebuild"
@@ -62,29 +62,26 @@ endif
 
 # Build RPM of virt-p2v.
 
-rpm:	checknotroot rpmbuild/$(VIRTP2V_RPM)
+rpm:	checknotroot p2vrepo/$(VIRTP2V_RPM)
 
 RPM_FLAGS := --define "_topdir       %(pwd)/rpmbuild" \
-	     --define "_builddir     %{_topdir}" \
-	     --define "_rpmdir       %{_topdir}" \
-	     --define "_srcrpmdir    %{_topdir}" \
-	     --define "_rpmfilename  $(VIRTP2V_RPM)" \
-	     --define "_specdir      %{_topdir}" \
+	     --define "_builddir     %{_topdir}/BUILD" \
+	     --define "_rpmdir       %{_topdir}/RPMS" \
+	     --define "_srcrpmdir    %{_topdir}/SRPMS" \
+	     --define "_specdir      %{_topdir}/SPECS" \
 	     --define "_sourcedir    %(pwd)"
 
-rpmbuild/$(VIRTP2V_RPM): \
+p2vrepo/$(VIRTP2V_RPM): \
 		virt-p2v.spec \
 		virt-p2v virt-p2v-update-wrapper iso-attach \
-		inittab
-	mkdir -p rpmbuild
+		inittab tty1
+	$(MAKE) dist
+	rm -rf rpmbuild
+	mkdir rpmbuild rpmbuild/{RPMS,BUILD,SRPMS,SPECS} rpmbuild/RPMS/noarch
 	rpmbuild $(RPM_FLAGS) -ba $<
-	createrepo rpmbuild
-
-# Make the final script.
-
-virt-p2v: virt-p2v.ml0 virt-p2v.ml
-	cat $^ > $@
-	chmod 0555 $@
+	mkdir -p p2vrepo
+	cp rpmbuild/RPMS/noarch/$(VIRTP2V_RPM) p2vrepo
+	createrepo p2vrepo
 
 # Run live CD under qemu.
 
@@ -107,6 +104,8 @@ endif
 ifneq ($(HDB),)
 QEMU_ARGS += -hdb $(HDB)
 endif
+SERIAL    = none
+QEMU_ARGS += -serial $(SERIAL)
 
 boot:
 	$(QEMU) $(QEMU_ARGS)
@@ -152,12 +151,12 @@ checkscript:
 # Check that the RPM has been built.
 
 checkrpm:
-	test -f rpmbuild/$(VIRTP2V_RPM)
+	test -f p2vrepo/$(VIRTP2V_RPM)
 
 # Clean.
 
 clean:
-	rm -f *~ core virt-p2v pod2htm*
+	rm -f core *~ pod2htm*
 
 distclean: clean
 	rm -rf autom4te.cache config.log config.status configure \