Correct the Carp version in perldelta

[perl5.git] / pod / Makefile.SH

diff --git a/pod/Makefile.SH b/pod/Makefile.SH
index 450b7ab..d970c86 100644 (file)
--- a/pod/Makefile.SH
+++ b/pod/Makefile.SH
@@ -54,13 +54,12 @@ LDLIBPTH = $ldlibpth
 ## In the following dollars and backticks do not need the extra backslash.
 $spitshell >>Makefile <<'!NO!SUBS!'
 
-CONVERTERS = pod2html pod2man pod2text
-
 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
 
@@ -68,13 +67,11 @@ PERL = ../miniperl
 PERLILIB = $(PERL) -I../lib
 REALPERL = ../perl
 
-all: $(CONVERTERS) man
-
-converters: $(CONVERTERS)
+all: man
 
-man:   pod2man $(MAN)
+man:   $(POD2MAN) $(MAN)
 
-html:  pod2html $(HTML)
+html:  $(POD2HTML) $(HTML)
 
 tex:   $(POD2LATEX) $(TEX)
 
@@ -85,19 +82,19 @@ toc perltoc.pod:    buildtoc
 
 .SUFFIXES: .man
 
-.pm.man:     pod2man
-       $(REALPERL) -I../lib pod2man $*.pm >$*.man
+.pm.man:     $(POD2MAN)
+       $(REALPERL) -I../lib $(POD2MAN) $*.pm >$*.man
 
-.pod.man:     pod2man
-       $(REALPERL) -I../lib pod2man $*.pod >$*.man
+.pod.man:     $(POD2MAN)
+       $(REALPERL) -I../lib $(POD2MAN) $*.pod >$*.man
 
 .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
 
@@ -115,7 +112,6 @@ clean:
        rm -f *.aux *.log *.exe
 
 realclean:     clean
-       rm -f $(CONVERTERS)
 
 distclean:     realclean
 
@@ -125,15 +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
-
-pod2man:       pod2man.PL ../lib/Config.pm
-       $(LDLIBPTH) $(PERL) -I ../lib pod2man.PL
-
-pod2text:      pod2text.PL ../lib/Config.pm
-       $(LDLIBPTH) $(PERL) -I ../lib pod2text.PL
-
 !NO!SUBS!