summaryrefslogtreecommitdiff
path: root/win32
diff options
context:
space:
mode:
authorNicholas Clark <nick@ccl4.org>2010-10-05 11:07:14 +0100
committerNicholas Clark <nick@ccl4.org>2010-10-05 13:48:51 +0100
commitbab7aada2e9c0074c39ee39ffeb3b8e6c550b204 (patch)
tree3d9a82464e8ba8051eb574920c31a8e489de6ee8 /win32
parentcde5101a7be11e27127dc4c214d749bb2cc993e6 (diff)
downloadperl-bab7aada2e9c0074c39ee39ffeb3b8e6c550b204.tar.gz
Move pod2man.PL, pod2text.PL, podselect.PL into cpan/podlators/scripts
Let ExtUtils::MakeMaker deal with running these extraction scripts, rather than repeating the logic in (at least) 5 places.
Diffstat (limited to 'win32')
-rw-r--r--win32/Makefile4
-rw-r--r--win32/Makefile.ce2
-rw-r--r--win32/makefile.mk4
-rw-r--r--win32/pod.mak15
4 files changed, 8 insertions, 17 deletions
diff --git a/win32/Makefile b/win32/Makefile
index c6222ecac3..9278618389 100644
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -613,8 +613,6 @@ UTILS = \
..\utils\shasum \
..\utils\instmodsh \
..\pod\pod2html \
- ..\pod\pod2man \
- ..\pod\pod2text \
..\x2p\find2perl \
..\x2p\psed \
..\x2p\s2p \
@@ -1199,7 +1197,7 @@ distclean: realclean
perlriscos.pod perlsolaris.pod perlsymbian.pod perltoc.pod \
perltru64.pod perltw.pod perluniprops.pod perluts.pod \
perlvmesa.pod perlvos.pod perlwin32.pod \
- pod2html pod2man pod2text
+ pod2html
-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 f7839830fc..d36764ea80 100644
--- a/win32/Makefile.ce
+++ b/win32/Makefile.ce
@@ -668,8 +668,6 @@ EXTENSION_PM = \
$(ERRNO_PM)
POD2HTML = $(PODDIR)\pod2html
-POD2MAN = $(PODDIR)\pod2man
-POD2TEXT = $(PODDIR)\pod2text
CFG_VARS = \
"INST_DRV=$(INST_DRV)" \
diff --git a/win32/makefile.mk b/win32/makefile.mk
index e6973eca53..c12260f24a 100644
--- a/win32/makefile.mk
+++ b/win32/makefile.mk
@@ -777,8 +777,6 @@ UTILS = \
..\utils\shasum \
..\utils\instmodsh \
..\pod\pod2html \
- ..\pod\pod2man \
- ..\pod\pod2text \
..\x2p\find2perl \
..\x2p\psed \
..\x2p\s2p \
@@ -1563,7 +1561,7 @@ distclean: realclean
perlriscos.pod perlsolaris.pod perlsymbian.pod perltoc.pod \
perltru64.pod perltw.pod perluniprops.pod perluts.pod \
perlvmesa.pod perlvos.pod perlwin32.pod \
- pod2html pod2man pod2text
+ pod2html
-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 d78a35129d..dcd10e5486 100644
--- a/win32/pod.mak
+++ b/win32/pod.mak
@@ -1,10 +1,12 @@
-CONVERTERS = pod2html pod2man pod2text
+CONVERTERS = pod2html
HTMLROOT = / # Change this to fix cross-references in HTML
POD2HTML = pod2html \
--htmlroot=$(HTMLROOT) \
--podroot=.. --podpath=pod:lib:ext:vms \
--libpods=perlfunc:perlguts:perlvar:perlrun:perlop
+POD2MAN = ../cpan/podlators/pod2man
+POD2TEXT = ../cpan/podlators/pod2text
POD2LATEX = ../cpan/Pod-LaTeX/pod2latex
PODCHECKER = ../cpan/Pod-Parser/podchecker
@@ -585,7 +587,7 @@ TEX = \
perlxs.tex \
perlxstut.tex
-man: pod2man $(MAN)
+man: $(POD2MAN) $(MAN)
html: pod2html $(HTML)
@@ -599,10 +601,10 @@ toc:
.SUFFIXES: .man
.pm.man:
- $(PERL) -I../lib pod2man $*.pm >$*.man
+ $(PERL) -I../lib $(POD2MAN) $*.pm >$*.man
.pod.man:
- $(PERL) -I../lib pod2man $*.pod >$*.man
+ $(PERL) -I../lib $(POD2MAN) $*.pod >$*.man
.SUFFIXES: .html
@@ -640,8 +642,3 @@ check: $(PODCHECKER)
pod2html: pod2html.PL ../lib/Config.pm
$(PERL) -I ../lib $(ICWD) pod2html.PL
-pod2man: pod2man.PL ../lib/Config.pm
- $(PERL) -I ../lib $(ICWD) pod2man.PL
-
-pod2text: pod2text.PL ../lib/Config.pm
- $(PERL) -I ../lib $(ICWD) pod2text.PL