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.

12 files changed, 24 insertions, 58 deletions

diff --git a/Cross/Makefile-cross-SH b/Cross/Makefile-cross-SH
index 6e1b49af44..b4be56f001 100644
--- a/Cross/Makefile-cross-SH
+++ b/Cross/Makefile-cross-SH
@@ -332,10 +332,10 @@ shextract = Makefile cflags config.h makeaperl makedepend \
 # Files to be built with variable substitution after miniperl is
 # available.  Dependencies handled manually below (for now).
 
-pl = pod/pod2html.PL
+pl =
 
 # lib/lib.pm is not listed here because it has a rule of its own.
-plextract = pod/pod2html
+plextract =
 
 addedbyconf = UU $(shextract) $(plextract) lib/lib.pm pstruct
 
diff --git a/MANIFEST b/MANIFEST
index a7dc7b6e43..7ddcc660af 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -3247,6 +3247,7 @@ ext/PerlIO-via/t/via.t		See if PerlIO::via works
 ext/PerlIO-via/via.pm		PerlIO layer for layers in perl
 ext/PerlIO-via/via.xs		PerlIO layer for layers in perl
 ext/Pod-Html/Html.pm		Convert POD data to HTML
+ext/Pod-Html/pod2html.PL	Precursor for translator to turn pod into HTML
 ext/Pod-Html/t/htmlescp.pod	pod2html escape test input data
 ext/Pod-Html/t/htmlescp.t	pod2html escape test
 ext/Pod-Html/t/htmllink.pod	pod2html link test input data
@@ -4144,7 +4145,6 @@ pod/perlvar.pod			Perl predefined variables
 pod/perlvms.pod			Perl notes for VMS
 pod/perlxs.pod			Perl XS application programming interface
 pod/perlxstut.pod		Perl XS tutorial
-pod/pod2html.PL			Precursor for translator to turn pod into HTML
 pod/roffitall			troff the whole man page set
 pod/rofftoc			Generate a table of contents in troff format
 pod/splitman			Splits perlfunc into multiple man pages
diff --git a/Makefile.SH b/Makefile.SH
index 1dec7838b0..df310c68f6 100755
--- a/Makefile.SH
+++ b/Makefile.SH
@@ -443,9 +443,9 @@ shextract = Makefile cflags config.h makeaperl makedepend \
 # Files to be built with variable substitution after miniperl is
 # available.  Dependencies handled manually below (for now).
 
-pl = pod/pod2html.PL
+pl =
 
-plextract = pod/pod2html
+plextract =
 
 addedbyconf = UU $(shextract) $(plextract) pstruct
 
diff --git a/pod/pod2html.PL b/ext/Pod-Html/pod2html.PL
index 366dc163bf..366dc163bf 100644
--- a/pod/pod2html.PL
+++ b/ext/Pod-Html/pod2html.PL
diff --git a/pod/Makefile.SH b/pod/Makefile.SH
index 35814248ba..d970c8682f 100644
--- a/pod/Makefile.SH
+++ b/pod/Makefile.SH
@@ -54,13 +54,11 @@ LDLIBPTH = $ldlibpth
 ## In the following dollars and backticks do not need the extra backslash.
 $spitshell >>Makefile <<'!NO!SUBS!'
 
-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
 POD2LATEX = ../cpan/Pod-LaTeX/pod2latex
 PODCHECKER =  ../cpan/Pod-Parser/podchecker
@@ -69,13 +67,11 @@ PERL = ../miniperl
 PERLILIB = $(PERL) -I../lib
 REALPERL = ../perl
 
-all: $(CONVERTERS) man
-
-converters: $(CONVERTERS)
+all: man
 
 man:	$(POD2MAN) $(MAN)
 
-html:	pod2html $(HTML)
+html:	$(POD2HTML) $(HTML)
 
 tex:	$(POD2LATEX) $(TEX)
 
@@ -94,11 +90,11 @@ toc perltoc.pod:	buildtoc
 
 .SUFFIXES: .html
 
-.pm.html:    pod2html
-	$(PERL) -I../lib $(POD2HTML) --infile=$*.pm --outfile=$*.html
+.pm.html:    $(POD2HTML)
+	$(PERL) -I../lib $(POD2HTML) $(POD2HTML_ARGS) --infile=$*.pm --outfile=$*.html
 
-.pod.html:    pod2html
-	$(PERL) -I../lib $(POD2HTML) --infile=$*.pod --outfile=$*.html
+.pod.html:    $(POD2HTML)
+	$(PERL) -I../lib $(POD2HTML) $(POD2HTML_ARGS) --infile=$*.pod --outfile=$*.html
 
 .SUFFIXES: .tex
 
@@ -116,7 +112,6 @@ clean:
 	rm -f *.aux *.log *.exe
 
 realclean:	clean
-	rm -f $(CONVERTERS)
 
 distclean:	realclean
 
@@ -126,9 +121,4 @@ veryclean:	distclean
 check:	$(PODCHECKER)
 	@echo "checking..."; \
 	$(PERL) -I../lib $(PODCHECKER) $(POD)
-
-# Dependencies.
-pod2html:	pod2html.PL ../lib/Config.pm
-	$(LDLIBPTH) $(PERL) -I ../lib pod2html.PL
-
 !NO!SUBS!
diff --git a/t/porting/dual-life.t b/t/porting/dual-life.t
index 6e28763a2b..5d4c45eb12 100644
--- a/t/porting/dual-life.t
+++ b/t/porting/dual-life.t
@@ -31,6 +31,7 @@ foreach (qw (podchecker podselect pod2usage)) {
 foreach (qw (pod2man pod2text)) {
     $dist_dir_exe{lc "$_.PL"} = "../cpan/podlators/$_";
 };
+$dist_dir_exe{'pod2html.pl'} = '../ext/Pod-Html';
 
 my @programs;
 
diff --git a/utils.lst b/utils.lst
index cc952bc655..308c0c7590 100644
--- a/utils.lst
+++ b/utils.lst
@@ -1,4 +1,4 @@
-pod/pod2html
+ext/Pod-Html/blib/script/pod2html
 cpan/Pod-LaTeX/blib/script/pod2latex
 cpan/podlators/blib/script/pod2man
 cpan/podlators/blib/script/pod2text
diff --git a/vms/descrip_mms.template b/vms/descrip_mms.template
index cc0c415731..98b592dd8b 100644
--- a/vms/descrip_mms.template
+++ b/vms/descrip_mms.template
@@ -388,14 +388,12 @@ git_version.h : $(MINIPERL_EXE) make_patchnum.pl
 
 base : miniperl git_version.h nonxsext perl
 	@ $(NOOP)
-extras : dynext libmods utils podxform extra.pods
+extras : dynext libmods utils extra.pods
 	@ $(NOOP)
 libmods : $(LIBPREREQ)
 	@ $(NOOP)
 utils : $(utils1) $(utils2) $(utils3) $(utils4) $(utils5)
 	@ $(NOOP)
-podxform : [.lib.pods]pod2html.com
-	@ $(NOOP)
 x2p : [.x2p]$(DBG)a2p$(E) [.x2p]s2p.com [.x2p]find2perl.com 
 	@ $(NOOP)
 extra.pods : miniperl
@@ -694,11 +692,6 @@ nonxsext : $(LIBPREREQ) preplibrary $(MINIPERL_EXE)
 	$(CC) $(X2PCFLAGS) /Include=[.x2p] $(MMS$SOURCE)
 .endif
 
-[.lib.pods]pod2html.com : [.pod]pod2html.PL $(ARCHDIR)Config.pm
-	@ If F$Search("[.lib]pods.dir").eqs."" Then Create/Directory [.lib.pods]
-	$(MINIPERL) -"I[-.lib]" $(MMS$SOURCE)
-	Copy/NoConfirm/Log [.pod]pod2html.com [.lib.pods]
-
 preplibrary : $(MINIPERL_EXE) $(LIBPREREQ) 
 
 makeppport : $(MINIPERL_EXE) $(ARCHDIR)Config.pm nonxsext
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
-