Move pod2html.PL into ext/Pod-Html

Let ExtUtils::MakeMaker deal with running these extraction scripts, rather than
repeating the logic in (at least) 5 places.

4 files changed, 8 insertions, 26 deletions

diff --git a/win32/Makefile b/win32/Makefile
index 9278618389..00bf322601 100644
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -612,7 +612,6 @@ UTILS		=			\
 		..\utils\cpan2dist	\
 		..\utils\shasum		\
 		..\utils\instmodsh	\
-		..\pod\pod2html		\
 		..\x2p\find2perl	\
 		..\x2p\psed		\
 		..\x2p\s2p		\
@@ -1095,7 +1094,6 @@ utils: $(PERLEXE) $(X2P)
 	copy ..\README.vos      ..\pod\perlvos.pod
 	copy ..\README.win32    ..\pod\perlwin32.pod
 	copy ..\pod\perldelta.pod ..\pod\perl5136delta.pod
-	$(MAKE) -f ..\win32\pod.mak converters
 	cd ..\win32
 	$(PERLEXE) $(PL2BAT) $(UTILS)
 	$(PERLEXE) $(ICWD) ..\autodoc.pl ..
@@ -1196,8 +1194,7 @@ distclean: realclean
 	    perlos390.pod perlos400.pod perlplan9.pod perlqnx.pod \
 	    perlriscos.pod perlsolaris.pod perlsymbian.pod perltoc.pod \
 	    perltru64.pod perltw.pod perluniprops.pod perluts.pod \
-	    perlvmesa.pod perlvos.pod perlwin32.pod \
-	    pod2html
+	    perlvmesa.pod perlvos.pod perlwin32.pod
 	-cd ..\utils && del /f h2ph splain perlbug pl2pm c2ph pstruct h2xs \
 	    perldoc perlivp dprofpp libnetcfg enc2xs piconv cpan *.bat \
 	    xsubpp instmodsh prove ptar ptardiff cpanp-run-perl cpanp cpan2dist shasum corelist config_data
diff --git a/win32/Makefile.ce b/win32/Makefile.ce
index d36764ea80..1a5df3d21a 100644
--- a/win32/Makefile.ce
+++ b/win32/Makefile.ce
@@ -667,8 +667,6 @@ ERRNO_PM	= $(LIBDIR)\Errno.pm
 EXTENSION_PM	=		\
 		$(ERRNO_PM)
 
-POD2HTML	= $(PODDIR)\pod2html
-
 CFG_VARS = \
  "INST_DRV=$(INST_DRV)" \
  "INST_TOP=$(INST_TOP)" \
diff --git a/win32/makefile.mk b/win32/makefile.mk
index c12260f24a..72d1d1a03e 100644
--- a/win32/makefile.mk
+++ b/win32/makefile.mk
@@ -776,7 +776,6 @@ UTILS		=			\
 		..\utils\cpan2dist	\
 		..\utils\shasum		\
 		..\utils\instmodsh	\
-		..\pod\pod2html		\
 		..\x2p\find2perl	\
 		..\x2p\psed		\
 		..\x2p\s2p		\
@@ -1460,7 +1459,6 @@ utils: $(PERLEXE) $(X2P)
 	copy ..\README.vos      ..\pod\perlvos.pod
 	copy ..\README.win32    ..\pod\perlwin32.pod
 	copy ..\pod\perldelta.pod ..\pod\perl5136delta.pod
-	cd ..\pod && $(MAKE) -f ..\win32\pod.mak converters
 	$(PERLEXE) $(PL2BAT) $(UTILS)
 	$(PERLEXE) $(ICWD) ..\autodoc.pl ..
 	$(PERLEXE) $(ICWD) ..\pod\perlmodlib.pl -q
@@ -1560,8 +1558,7 @@ distclean: realclean
 	    perlos390.pod perlos400.pod perlplan9.pod perlqnx.pod \
 	    perlriscos.pod perlsolaris.pod perlsymbian.pod perltoc.pod \
 	    perltru64.pod perltw.pod perluniprops.pod perluts.pod \
-	    perlvmesa.pod perlvos.pod perlwin32.pod \
-	    pod2html
+	    perlvmesa.pod perlvos.pod perlwin32.pod
 	-cd ..\utils && del /f h2ph splain perlbug pl2pm c2ph pstruct h2xs \
 	    perldoc perlivp dprofpp libnetcfg enc2xs piconv cpan *.bat \
 	    xsubpp instmodsh prove ptar ptardiff cpanp-run-perl cpanp cpan2dist shasum corelist config_data
diff --git a/win32/pod.mak b/win32/pod.mak
index dcd10e5486..9168385653 100644
--- a/win32/pod.mak
+++ b/win32/pod.mak
@@ -1,18 +1,14 @@
-CONVERTERS = pod2html
-
 HTMLROOT = /	# Change this to fix cross-references in HTML
-POD2HTML = pod2html \
-	    --htmlroot=$(HTMLROOT) \
+POD2HTML_ARGS = --htmlroot=$(HTMLROOT) \
 	    --podroot=.. --podpath=pod:lib:ext:vms \
 	    --libpods=perlfunc:perlguts:perlvar:perlrun:perlop
+POD2HTML = ../ext/Pod-Html/pod2html
 POD2MAN = ../cpan/podlators/pod2man
 POD2TEXT = ../cpan/podlators/pod2text
 POD2LATEX = ../cpan/Pod-LaTeX/pod2latex
 PODCHECKER = ../cpan/Pod-Parser/podchecker
 
-all: $(CONVERTERS) html
-
-converters: $(CONVERTERS)
+all: html
 
 PERL = ..\miniperl.exe
 REALPERL = ..\perl.exe
@@ -589,7 +585,7 @@ TEX = \
 
 man:	$(POD2MAN) $(MAN)
 
-html:	pod2html $(HTML)
+html:	$(POD2HTML) $(HTML)
 
 tex:	$(POD2LATEX) $(TEX)
 
@@ -609,10 +605,10 @@ toc:
 .SUFFIXES: .html
 
 .pm.html:
-	$(PERL) -I../lib $(POD2HTML) --infile=$*.pm --outfile=$*.html
+	$(PERL) -I../lib $(POD2HTML) $(POD2HTML_ARGS) --infile=$*.pm --outfile=$*.html
 
 .pod.html:
-	$(PERL) -I../lib $(POD2HTML) --infile=$*.pod --outfile=$*.html
+	$(PERL) -I../lib $(POD2HTML) $(POD2HTML_ARGS) --infile=$*.pod --outfile=$*.html
 
 .SUFFIXES: .tex
 
@@ -630,15 +626,9 @@ clean:
 	rm -f *.aux *.log *.exe
 
 realclean:	clean
-	rm -f $(CONVERTERS)
 
 distclean:	realclean
 
 check:	$(PODCHECKER)
 	@echo "checking..."; \
 	$(PERL) -I../lib $(PODCHECKER) $(POD)
-
-# Dependencies.
-pod2html:	pod2html.PL ../lib/Config.pm
-	$(PERL) -I ../lib $(ICWD) pod2html.PL
-