Fix new path to RPM.

[virt-p2v.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index f5df4b4..38476b8 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -62,23 +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
+       mkdir -p p2vrepo
+       cp rpmbuild/RPMS/noarch/$(VIRTP2V_RPM) p2vrepo
+       createrepo p2vrepo
 
 # Make the final script.
 
@@ -152,7 +155,7 @@ checkscript:
 # Check that the RPM has been built.
 
 checkrpm:
-       test -f rpmbuild/$(VIRTP2V_RPM)
+       test -f p2vrepo/$(VIRTP2V_RPM)
 
 # Clean.