Change 27530 by [EMAIL PROTECTED] on 2006/03/17 11:10:41
Install POD files into "lib\pods" rather than "lib\pod" on Win32
to avoid clashing with "lib\Pod" (cf. perl change #26363)
Also remove a couple of unused macros from the makefiles
Affected files ...
... //depot/perl/installperl#137 edit
... //depot/perl/win32/Makefile#295 edit
... //depot/perl/win32/makefile.mk#334 edit
Differences ...
==== //depot/perl/installperl#137 (xtext) ====
Index: perl/installperl
--- perl/installperl#136~27491~ 2006-03-13 15:13:23.000000000 -0800
+++ perl/installperl 2006-03-17 03:10:41.000000000 -0800
@@ -602,7 +602,7 @@
# Install pod pages. Where? I guess in $installprivlib/pod
# ($installprivlib/pods for cygwin).
-my $pod = ($Is_Cygwin || $Is_Darwin || $Is_VMS) ? 'pods' : 'pod';
+my $pod = ($Is_Cygwin || $Is_Darwin || $Is_VMS || $Is_W32) ? 'pods' : 'pod';
if ( !$versiononly || ($installprivlib =~ m/\Q$ver/)) {
mkpath("${installprivlib}/$pod", $verbose, 0777);
==== //depot/perl/win32/Makefile#295 (text) ====
Index: perl/win32/Makefile
--- perl/win32/Makefile#294~27503~ 2006-03-15 04:34:10.000000000 -0800
+++ perl/win32/Makefile 2006-03-17 03:10:41.000000000 -0800
@@ -360,7 +360,6 @@
INST_LIB = $(INST_TOP)$(INST_VER)\lib
INST_ARCHLIB = $(INST_LIB)$(INST_ARCH)
INST_COREDIR = $(INST_ARCHLIB)\CORE
-INST_POD = $(INST_LIB)\pod
INST_HTML = $(INST_TOP)$(INST_VER)\html
#
@@ -875,11 +874,6 @@
$(COMPRESSZLIB_DLL) \
$(WIN32_DLL)
-POD2HTML = $(PODDIR)\pod2html
-POD2MAN = $(PODDIR)\pod2man
-POD2LATEX = $(PODDIR)\pod2latex
-POD2TEXT = $(PODDIR)\pod2text
-
CFG_VARS = \
"INST_DRV=$(INST_DRV)" \
"INST_TOP=$(INST_TOP)" \
==== //depot/perl/win32/makefile.mk#334 (text) ====
Index: perl/win32/makefile.mk
--- perl/win32/makefile.mk#333~27421~ 2006-03-08 08:25:23.000000000 -0800
+++ perl/win32/makefile.mk 2006-03-17 03:10:41.000000000 -0800
@@ -355,7 +355,6 @@
INST_LIB = $(INST_TOP)$(INST_VER)\lib
INST_ARCHLIB = $(INST_LIB)$(INST_ARCH)
INST_COREDIR = $(INST_ARCHLIB)\CORE
-INST_POD = $(INST_LIB)\pod
INST_HTML = $(INST_TOP)$(INST_VER)\html
#
@@ -893,11 +892,6 @@
DYNALOADER = $(EXTDIR)\DynaLoader\DynaLoader
-POD2HTML = $(PODDIR)\pod2html
-POD2MAN = $(PODDIR)\pod2man
-POD2LATEX = $(PODDIR)\pod2latex
-POD2TEXT = $(PODDIR)\pod2text
-
# vars must be separated by "\t+~\t+", since we're using the tempfile
# version of config_sh.pl (we were overflowing someone's buffer by
# trying to fit them all on the command line)
End of Patch.
