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
p4raw-link: @26363 on //depot/perl: 0661f42382c6c9047f6bb741b9d41f6f7333902f

p4raw-id: //depot/perl@27530

diff --git a/installperl b/installperl
index 919fc64..76d299d 100755 (executable)
--- a/installperl
+++ b/installperl
@@ -602,7 +602,7 @@ if ($versiononly) {
 # 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);
 

diff --git a/win32/Makefile b/win32/Makefile
index 775f0be..493b3ec 100644 (file)
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -360,7 +360,6 @@ INST_BIN    = $(INST_SCRIPT)$(INST_ARCH)
 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 @@ EXTENSION_DLL      =               \
                $(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)"                  \

diff --git a/win32/makefile.mk b/win32/makefile.mk
index 255c76d..2fe0c44 100644 (file)
--- a/win32/makefile.mk
+++ b/win32/makefile.mk
@@ -355,7 +355,6 @@ INST_BIN    = $(INST_SCRIPT)$(INST_ARCH)
 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 @@ NONXS_EXT  = Errno
 
 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)