summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Cross/Makefile-cross-SH4
-rw-r--r--MANIFEST2
-rwxr-xr-xMakefile.SH4
-rwxr-xr-xPorting/Maintainers.pl7
-rw-r--r--cpan/Pod-LaTeX/pod2latex.PL (renamed from pod/pod2latex.PL)0
-rw-r--r--pod/Makefile.SH16
-rw-r--r--utils.lst2
-rw-r--r--vms/descrip_mms.template7
-rw-r--r--win32/Makefile3
-rw-r--r--win32/Makefile.ce1
-rw-r--r--win32/makefile.mk3
-rw-r--r--win32/pod.mak12
12 files changed, 22 insertions, 39 deletions
diff --git a/Cross/Makefile-cross-SH b/Cross/Makefile-cross-SH
index 1a232a153d..dfb2fd1d19 100644
--- a/Cross/Makefile-cross-SH
+++ b/Cross/Makefile-cross-SH
@@ -332,11 +332,11 @@ 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 pod/pod2latex.PL pod/pod2man.PL pod/pod2text.PL \
+pl = pod/pod2html.PL pod/pod2man.PL pod/pod2text.PL \
pod/pod2usage.PL pod/podchecker.PL pod/podselect.PL
# lib/lib.pm is not listed here because it has a rule of its own.
-plextract = pod/pod2html pod/pod2latex pod/pod2man pod/pod2text \
+plextract = pod/pod2html pod/pod2man pod/pod2text \
pod/pod2usage pod/podchecker pod/podselect
addedbyconf = UU $(shextract) $(plextract) lib/lib.pm pstruct
diff --git a/MANIFEST b/MANIFEST
index cf171b5bbc..7dde7c7871 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1635,6 +1635,7 @@ cpan/Pod-Escapes/t/01_about_verbose.t test Pod::Escapes
cpan/Pod-Escapes/t/10_main.t test Pod::Escapes
cpan/Pod-Escapes/t/15_name2charnum.t test Pod::Escapes
cpan/Pod-LaTeX/LaTeX.pm Convert POD data to LaTeX
+cpan/Pod-LaTeX/pod2latex.PL Precursor for translator to turn pod into LaTeX
cpan/Pod-LaTeX/t/pod2latex.t See if Pod::LaTeX works
cpan/Pod-LaTeX/t/user.t See if Pod::LaTeX works
cpan/podlators/lib/Pod/Man.pm Convert POD data to *roff
@@ -4139,7 +4140,6 @@ 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/pod2latex.PL Precursor for translator to turn pod into LaTeX
pod/pod2man.PL Precursor for translator to turn pod into manpage
pod/pod2text.PL Precursor for translator to turn pod into text
pod/pod2usage.PL Pod-Parser - print usage messages from POD docs
diff --git a/Makefile.SH b/Makefile.SH
index 45ee6ecbd5..7eb9008270 100755
--- a/Makefile.SH
+++ b/Makefile.SH
@@ -443,10 +443,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 pod/pod2latex.PL pod/pod2man.PL pod/pod2text.PL \
+pl = pod/pod2html.PL pod/pod2man.PL pod/pod2text.PL \
pod/pod2usage.PL pod/podchecker.PL pod/podselect.PL
-plextract = pod/pod2html pod/pod2latex pod/pod2man pod/pod2text \
+plextract = pod/pod2html pod/pod2man pod/pod2text \
pod/pod2usage pod/podchecker pod/podselect
addedbyconf = UU $(shextract) $(plextract) pstruct
diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl
index da78945f8b..da317aba8b 100755
--- a/Porting/Maintainers.pl
+++ b/Porting/Maintainers.pl
@@ -1148,13 +1148,8 @@ use File::Glob qw(:case);
{
'MAINTAINER' => 'tjenness',
'DISTRIBUTION' => 'TJENNESS/Pod-LaTeX-0.58.tar.gz',
- 'FILES' => q[cpan/Pod-LaTeX
- pod/pod2latex.PL
- ],
+ 'FILES' => q[cpan/Pod-LaTeX],
'EXCLUDED' => [ qw( t/require.t ) ],
- 'MAP' => { '' => 'cpan/Pod-LaTeX/',
- 'pod2latex.PL' => 'pod/pod2latex.PL',
- },
'UPSTREAM' => undef,
},
diff --git a/pod/pod2latex.PL b/cpan/Pod-LaTeX/pod2latex.PL
index 9838edc889..9838edc889 100644
--- a/pod/pod2latex.PL
+++ b/cpan/Pod-LaTeX/pod2latex.PL
diff --git a/pod/Makefile.SH b/pod/Makefile.SH
index 1d53de7f9d..17d815084c 100644
--- a/pod/Makefile.SH
+++ b/pod/Makefile.SH
@@ -54,7 +54,7 @@ LDLIBPTH = $ldlibpth
## In the following dollars and backticks do not need the extra backslash.
$spitshell >>Makefile <<'!NO!SUBS!'
-CONVERTERS = pod2html pod2latex pod2man pod2text \
+CONVERTERS = pod2html pod2man pod2text \
pod2usage podchecker podselect
HTMLROOT = / # Change this to fix cross-references in HTML
@@ -62,6 +62,7 @@ POD2HTML = pod2html \
--htmlroot=$(HTMLROOT) \
--podroot=.. --podpath=pod:lib:ext:vms \
--libpods=perlfunc:perlguts:perlvar:perlrun:perlop
+POD2LATEX = ../cpan/Pod-LaTeX/pod2latex
PERL = ../miniperl
PERLILIB = $(PERL) -I../lib
@@ -75,7 +76,7 @@ man: pod2man $(MAN)
html: pod2html $(HTML)
-tex: pod2latex $(TEX)
+tex: $(POD2LATEX) $(TEX)
toc perltoc.pod: buildtoc
$(PERLILIB) buildtoc --build-toc
@@ -100,11 +101,11 @@ toc perltoc.pod: buildtoc
.SUFFIXES: .tex
-.pm.tex: pod2latex
- $(PERL) -I../lib pod2latex $*.pm
+.pm.tex: $(POD2LATEX)
+ $(PERL) -I../lib $(POD2LATEX) $*.pm
-.pod.tex: pod2latex
- $(PERL) -I../lib pod2latex $*.pod
+.pod.tex: $(POD2LATEX)
+ $(PERL) -I../lib $(POD2LATEX) $*.pod
clean:
rm -f $(MAN)
@@ -126,9 +127,6 @@ check: podchecker
$(PERL) -I../lib podchecker $(POD)
# Dependencies.
-pod2latex: pod2latex.PL ../lib/Config.pm
- $(LDLIBPTH) $(PERL) -I../lib pod2latex.PL
-
pod2html: pod2html.PL ../lib/Config.pm
$(LDLIBPTH) $(PERL) -I ../lib pod2html.PL
diff --git a/utils.lst b/utils.lst
index b92c51318b..ec73a19cd7 100644
--- a/utils.lst
+++ b/utils.lst
@@ -1,5 +1,5 @@
pod/pod2html
-pod/pod2latex
+cpan/Pod-LaTeX/blib/script/pod2latex
pod/pod2man
pod/pod2text
pod/pod2usage
diff --git a/vms/descrip_mms.template b/vms/descrip_mms.template
index 43a9fe239e..2510e73ed8 100644
--- a/vms/descrip_mms.template
+++ b/vms/descrip_mms.template
@@ -394,7 +394,7 @@ libmods : $(LIBPREREQ)
@ $(NOOP)
utils : $(utils1) $(utils2) $(utils3) $(utils4) $(utils5)
@ $(NOOP)
-podxform : [.lib.pods]pod2text.com [.lib.pods]pod2html.com [.lib.pods]pod2latex.com [.lib.pods]pod2man.com [.lib.pods]podchecker.com [.lib.pods]pod2usage.com [.lib.pods]podselect.com
+podxform : [.lib.pods]pod2text.com [.lib.pods]pod2html.com [.lib.pods]pod2man.com [.lib.pods]podchecker.com [.lib.pods]pod2usage.com [.lib.pods]podselect.com
@ $(NOOP)
x2p : [.x2p]$(DBG)a2p$(E) [.x2p]s2p.com [.x2p]find2perl.com
@ $(NOOP)
@@ -699,11 +699,6 @@ nonxsext : $(LIBPREREQ) preplibrary $(MINIPERL_EXE)
$(MINIPERL) -"I[-.lib]" $(MMS$SOURCE)
Copy/NoConfirm/Log [.pod]pod2html.com [.lib.pods]
-[.lib.pods]pod2latex.com : [.pod]pod2latex.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]pod2latex.com [.lib.pods]
-
[.lib.pods]pod2man.com : [.pod]pod2man.PL $(ARCHDIR)Config.pm
@ If F$Search("[.lib]pods.dir").eqs."" Then Create/Directory [.lib.pods]
$(MINIPERL) -"I[-.lib]" $(MMS$SOURCE)
diff --git a/win32/Makefile b/win32/Makefile
index ab32dbc00c..a4eae3c44b 100644
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -613,7 +613,6 @@ UTILS = \
..\utils\shasum \
..\utils\instmodsh \
..\pod\pod2html \
- ..\pod\pod2latex \
..\pod\pod2man \
..\pod\pod2text \
..\pod\pod2usage \
@@ -1203,7 +1202,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 pod2latex pod2man pod2text pod2usage \
+ pod2html pod2man pod2text pod2usage \
podchecker podselect
-cd ..\utils && del /f h2ph splain perlbug pl2pm c2ph pstruct h2xs \
perldoc perlivp dprofpp libnetcfg enc2xs piconv cpan *.bat \
diff --git a/win32/Makefile.ce b/win32/Makefile.ce
index 8283d2e787..f7839830fc 100644
--- a/win32/Makefile.ce
+++ b/win32/Makefile.ce
@@ -669,7 +669,6 @@ EXTENSION_PM = \
POD2HTML = $(PODDIR)\pod2html
POD2MAN = $(PODDIR)\pod2man
-POD2LATEX = $(PODDIR)\pod2latex
POD2TEXT = $(PODDIR)\pod2text
CFG_VARS = \
diff --git a/win32/makefile.mk b/win32/makefile.mk
index a541260753..a48cadefa0 100644
--- a/win32/makefile.mk
+++ b/win32/makefile.mk
@@ -777,7 +777,6 @@ UTILS = \
..\utils\shasum \
..\utils\instmodsh \
..\pod\pod2html \
- ..\pod\pod2latex \
..\pod\pod2man \
..\pod\pod2text \
..\pod\pod2usage \
@@ -1567,7 +1566,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 pod2latex pod2man pod2text pod2usage \
+ pod2html pod2man pod2text pod2usage \
podchecker podselect
-cd ..\utils && del /f h2ph splain perlbug pl2pm c2ph pstruct h2xs \
perldoc perlivp dprofpp libnetcfg enc2xs piconv cpan *.bat \
diff --git a/win32/pod.mak b/win32/pod.mak
index 716fe1dd36..d781e22957 100644
--- a/win32/pod.mak
+++ b/win32/pod.mak
@@ -1,4 +1,4 @@
-CONVERTERS = pod2html pod2latex pod2man pod2text \
+CONVERTERS = pod2html pod2man pod2text \
pod2usage podchecker podselect
HTMLROOT = / # Change this to fix cross-references in HTML
@@ -6,6 +6,7 @@ POD2HTML = pod2html \
--htmlroot=$(HTMLROOT) \
--podroot=.. --podpath=pod:lib:ext:vms \
--libpods=perlfunc:perlguts:perlvar:perlrun:perlop
+POD2LATEX = ../cpan/Pod-LaTeX/pod2latex
all: $(CONVERTERS) html
@@ -588,7 +589,7 @@ man: pod2man $(MAN)
html: pod2html $(HTML)
-tex: pod2latex $(TEX)
+tex: $(POD2LATEX) $(TEX)
toc:
$(PERL) -I../lib buildtoc >perltoc.pod
@@ -614,10 +615,10 @@ toc:
.SUFFIXES: .tex
.pm.tex:
- $(PERL) -I../lib pod2latex $*.pm
+ $(PERL) -I../lib $(POD2LATEX) $*.pm
.pod.tex:
- $(PERL) -I../lib pod2latex $*.pod
+ $(PERL) -I../lib $(POD2LATEX) $*.pod
clean:
rm -f $(MAN)
@@ -636,9 +637,6 @@ check: podchecker
$(PERL) -I../lib podchecker $(POD)
# Dependencies.
-pod2latex: pod2latex.PL ../lib/Config.pm
- $(PERL) -I../lib $(ICWD) pod2latex.PL
-
pod2html: pod2html.PL ../lib/Config.pm
$(PERL) -I ../lib $(ICWD) pod2html.PL
View Lorry Controller Status