X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=Makefile;h=6d0a0c9226d2cb4e3591f5c3e2862bfb9703bd7d;hb=65b46ce56a110e798c9a21f99eb7969f5ca073e3;hp=d250b867c6fceeaf31e6900a21eea62e4f10ace1;hpb=3bbcbfe8c8a210aab420a97e1b0d2c9d75b0fd39;p=virt-p2v.git

diff --git a/Makefile b/Makefile
index d250b86..6d0a0c9 100644
--- a/Makefile
+++ b/Makefile
@@ -23,7 +23,7 @@
 # General configuration
 
 PACKAGE  := virt-p2v
-VERSION  := 0.8
+VERSION  := 0.9.1
 
 # i386 images also work on x86-64, so best to stick with i386.
 ARCH     := i386
@@ -53,6 +53,7 @@ all:
 	@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"
+	@echo "make man       Make man pages (needs POD)"
 
 # Build live CD.
 
@@ -72,11 +73,15 @@ livecd.ks: livecd.ks.in livecd-post.sh Makefile
 	  -e 's|@TIMEZONE@|$(TIMEZONE)|g' \
 	  < $< | cat - livecd-post.sh > $@
 
-livecd-post.sh: livecd-post.sh.in virt-p2v.ml inittab lvm.conf Makefile
+livecd-post.sh: livecd-post.sh.in virt-p2v virt-p2v-update-wrapper iso-attach inittab lvm.conf Makefile
 	rm -f $@
 	sed \
-	  -e '/@VIRT-P2V.ML@/ r virt-p2v.ml' \
-	  -e '/@VIRT-P2V.ML@/ d' \
+	  -e '/@VIRT-P2V@/ r virt-p2v' \
+	  -e '/@VIRT-P2V@/ d' \
+	  -e '/@VIRT-P2V-UPDATE-WRAPPER@/ r virt-p2v-update-wrapper' \
+	  -e '/@VIRT-P2V-UPDATE-WRAPPER@/ d' \
+	  -e '/@ISO-ATTACH@/ r iso-attach' \
+	  -e '/@ISO-ATTACH@/ d' \
 	  -e '/@INITTAB@/ r inittab' \
 	  -e '/@INITTAB@/ d' \
 	  -e '/@LVM.CONF@/ r lvm.conf' \
@@ -102,9 +107,9 @@ boot:
 
 # Update an existing ISO.
 
-update: checkroot
-	-./update-iso.ml delete $(ISO)
-	./update-iso.ml add $(ISO) virt-p2v.ml
+update: checkroot checkscript
+	-./iso-attach delete $(ISO)
+	./iso-attach add $(ISO) virt-p2v
 
 # Check that we are root.
 
@@ -117,7 +122,7 @@ checkroot:
 # Check that the script compiles.
 
 checkscript:
-	./virt-p2v.ml --test
+	./virt-p2v --test
 
 # Clean.
 
@@ -136,15 +141,33 @@ dist:
 	ls -l $(PACKAGE)-$(VERSION).tar.gz
 
 check-manifest:
-	@for d in `find -type d -name CVS | grep -v '^\./debian/'`; \
-	do \
-	b=`dirname $$d`/; \
-	awk -F/ '$$1 != "D" {print $$2}' $$d/Entries | \
-	sed -e "s|^|$$b|" -e "s|^\./||"; \
-	done | sort > .check-manifest; \
+	@hg manifest | sort > .check-manifest; \
 	sort MANIFEST > .orig-manifest; \
 	diff -u .orig-manifest .check-manifest; rv=$$?; \
 	rm -f .orig-manifest .check-manifest; \
 	exit $$rv
 
+# Manual page.
+
+MAN_SECTION := Virtualization Support
+
+man: virt-p2v.1 virt-p2v.1.txt virt-p2v.1.html
+
+virt-p2v.1: virt-p2v.pod
+	pod2man -c "$(MAN_SECTION)" --release "$(PACKAGE)-$(VERSION)" $< > $@
+
+virt-p2v.1.txt: virt-p2v.pod
+	pod2text $< > $@
+
+virt-p2v.1.html: virt-p2v.pod
+	pod2html -css virt-p2v.1.css $< > $@
+
+# Website.
+
+WEBSITE_DIR := ../redhat/et-website/virt-p2v
+
+website: man dist
+	cp virt-p2v.1.html $(WEBSITE_DIR)
+	cp $(PACKAGE)-$(VERSION).tar.gz $(WEBSITE_DIR)
+
 .PHONY:	build boot checkroot
\ No newline at end of file