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

diff --git a/Makefile.in b/Makefile.in
index f5df4b4..8d29f45 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -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
+	$(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.
 
@@ -152,12 +149,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 \