--- trunk/Makefile.PL	2005/01/12 19:28:41	38
+++ trunk/Makefile.PL	2006/07/09 13:20:06	60
@@ -7,7 +7,7 @@
 	AUTHOR => 'Dobrica Pavlinusic (dpavlin@rot13.org)',
 	ABSTRACT_FROM => 'lib/Biblio/Isis.pm',
 	PREREQ_PM => {
-		'Test::Simple' => 0.44,
+		'Test::More' => 0,
 		'Carp' => 0,
 		'File::Glob' => 0,
 		'File::Spec' => 0,
@@ -23,13 +23,13 @@
 HTML_DIR=pod2html
 
 html: $(TO_INST_PM)
-	test -e $(HTML_DIR) && rm -Rf $(HTML_DIR)
+	test -e $(HTML_DIR) && rm -Rf $(HTML_DIR) || true
 	mkdir $(HTML_DIR)
-	perl -MPod::Simple::HTMLBatch -e 'Pod::Simple::HTMLBatch::go' lib/ pod2html/
+	allpod2xhtml.pl lib/ $(HTML_DIR)
 	test ! -z "`which svn2html.pl`" && svn update && svn2html.pl > $(HTML_DIR)/Changes.html
 
 changelog:
-	svn update && svn -v log > Changes
+	svk update && svk -v log > Changes
 
 tags:
 	ctags *.p? */*.p?
@@ -41,5 +41,15 @@
 bench:	all
 	cd ./scripts/ && ./bench.pl
 
+cpan:
+	make clean
+	rm -f Biblio-Isis-*.tar.gz
+	perl Makefile.PL
+	make changelog
+	make dist
+	make disttest
+	@echo
+	@echo -n "Upload" Biblio-Isis-*.tar.gz "to CPAN? [y/N]:"
+	@read upload && test "$$upload" == "y" && cpan-upload -verbose Biblio-Isis-*.tar.gz
 MAKE_MORE
 }