Bump version number to 5.10.0.

p4raw-id: //depot/perl@31799

18 files changed, 102 insertions, 101 deletions

diff --git a/Cross/config.sh-arm-linux b/Cross/config.sh-arm-linux
index 11e9ea1bd0..a7a4b0dd17 100644
--- a/Cross/config.sh-arm-linux
+++ b/Cross/config.sh-arm-linux
@@ -34,10 +34,10 @@ aphostname='/bin/hostname'
 api_revision='5'
 api_subversion='0'
 api_version='9'
-api_versionstring='5.9.5'
+api_versionstring='5.10.0'
 ar='ar'
-archlib='/usr/lib/perl5/5.9.5/armv4l-linux'
-archlibexp='/usr/lib/perl5/5.9.5/armv4l-linux'
+archlib='/usr/lib/perl5/5.10.0/armv4l-linux'
+archlibexp='/usr/lib/perl5/5.10.0/armv4l-linux'
 archname64=''
 archname='armv4l-linux'
 archobjs=''
@@ -55,7 +55,7 @@ castflags='0'
 cat='cat'
 cc='cc'
 cccdlflags='-fpic'
-ccdlflags='-rdynamic -Wl,-rpath,/usr/lib/perl5/5.9.5/armv4l-linux/CORE'
+ccdlflags='-rdynamic -Wl,-rpath,/usr/lib/perl5/5.10.0/armv4l-linux/CORE'
 ccflags='-fno-strict-aliasing -I/usr/local/include -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64'
 ccflags_uselargefiles='-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64'
 ccname='arm-linux-gcc'
@@ -697,7 +697,7 @@ inc_version_list=' '
 inc_version_list_init='0'
 incpath=''
 inews=''
-installarchlib='./install_me_here/usr/lib/perl5/5.9.5/armv4l-linux'
+installarchlib='./install_me_here/usr/lib/perl5/5.10.0/armv4l-linux'
 installbin='./install_me_here/usr/bin'
 installhtml1dir=''
 installhtml3dir=''
@@ -705,13 +705,13 @@ installman1dir='./install_me_here/usr/share/man/man1'
 installman3dir='./install_me_here/usr/share/man/man3'
 installprefix='./install_me_here/usr'
 installprefixexp='./install_me_here/usr'
-installprivlib='./install_me_here/usr/lib/perl5/5.9.5'
+installprivlib='./install_me_here/usr/lib/perl5/5.10.0'
 installscript='./install_me_here/usr/bin'
-installsitearch='./install_me_here/usr/lib/perl5/site_perl/5.9.5/armv4l-linux'
+installsitearch='./install_me_here/usr/lib/perl5/site_perl/5.10.0/armv4l-linux'
 installsitebin='./install_me_here/usr/bin'
 installsitehtml1dir=''
 installsitehtml3dir=''
-installsitelib='./install_me_here/usr/lib/perl5/site_perl/5.9.5'
+installsitelib='./install_me_here/usr/lib/perl5/site_perl/5.10.0'
 installsiteman1dir='./install_me_here/usr/share/man/man1'
 installsiteman3dir='./install_me_here/usr/share/man/man3'
 installsitescript='./install_me_here/usr/bin'
@@ -838,8 +838,8 @@ pmake=''
 pr=''
 prefix='/usr'
 prefixexp='/usr'
-privlib='/usr/lib/perl5/5.9.5'
-privlibexp='/usr/lib/perl5/5.9.5'
+privlib='/usr/lib/perl5/5.10.0'
+privlibexp='/usr/lib/perl5/5.10.0'
 procselfexe='"/proc/self/exe"'
 prototype='define'
 ptrsize='4'
@@ -900,17 +900,17 @@ sig_num='0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26
 sig_num_init='0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 6, 17, 29, 31, 0'
 sig_size='68'
 signal_t='void'
-sitearch='/usr/lib/perl5/site_perl/5.9.5/armv4l-linux'
-sitearchexp='/usr/lib/perl5/site_perl/5.9.5/armv4l-linux'
+sitearch='/usr/lib/perl5/site_perl/5.10.0/armv4l-linux'
+sitearchexp='/usr/lib/perl5/site_perl/5.10.0/armv4l-linux'
 sitebin='/usr/bin'
 sitebinexp='/usr/bin'
 sitehtml1dir=''
 sitehtml1direxp=''
 sitehtml3dir=''
 sitehtml3direxp=''
-sitelib='/usr/lib/perl5/site_perl/5.9.5'
+sitelib='/usr/lib/perl5/site_perl/5.10.0'
 sitelib_stem='/usr/lib/perl5/site_perl'
-sitelibexp='/usr/lib/perl5/site_perl/5.9.5'
+sitelibexp='/usr/lib/perl5/site_perl/5.10.0'
 siteman1dir='/usr/share/man/man1'
 siteman1direxp='/usr/share/man/man1'
 siteman3dir='/usr/share/man/man3'
@@ -1032,7 +1032,7 @@ vendorprefix=''
 vendorprefixexp=''
 vendorscript=''
 vendorscriptexp=''
-version='5.9.5'
+version='5.10.0'
 version_patchlevel_string='version 9 subversion 4'
 versiononly='undef'
 vi=''
diff --git a/Cross/config.sh-arm-linux-n770 b/Cross/config.sh-arm-linux-n770
index 1f9ce2e7c3..6b4d5a06cb 100644
--- a/Cross/config.sh-arm-linux-n770
+++ b/Cross/config.sh-arm-linux-n770
@@ -34,10 +34,10 @@ aphostname='/bin/hostname'
 api_revision='5'
 api_subversion='0'
 api_version='9'
-api_versionstring='5.9.5'
+api_versionstring='5.10.0'
 ar='ar'
-archlib='/usr/lib/perl5/5.9.5/armv4l-linux'
-archlibexp='/usr/lib/perl5/5.9.5/armv4l-linux'
+archlib='/usr/lib/perl5/5.10.0/armv4l-linux'
+archlibexp='/usr/lib/perl5/5.10.0/armv4l-linux'
 archname64=''
 archname='armv4l-linux'
 archobjs=''
@@ -55,7 +55,7 @@ castflags='0'
 cat='cat'
 cc='arm-none-linux-gnueabi-gcc'
 cccdlflags='-fpic'
-ccdlflags='-rdynamic -Wl,-rpath,/usr/lib/perl5/5.9.5/armv4l-linux/CORE'
+ccdlflags='-rdynamic -Wl,-rpath,/usr/lib/perl5/5.10.0/armv4l-linux/CORE'
 ccflags='-fno-strict-aliasing -I/usr/local/include -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64'
 ccflags_uselargefiles='-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64'
 ccname='arm-linux-gcc'
@@ -697,7 +697,7 @@ inc_version_list=' '
 inc_version_list_init='0'
 incpath=''
 inews=''
-installarchlib='./install_me_here/usr/lib/perl5/5.9.5/armv4l-linux'
+installarchlib='./install_me_here/usr/lib/perl5/5.10.0/armv4l-linux'
 installbin='./install_me_here/usr/bin'
 installhtml1dir=''
 installhtml3dir=''
@@ -705,13 +705,13 @@ installman1dir='./install_me_here/usr/share/man/man1'
 installman3dir='./install_me_here/usr/share/man/man3'
 installprefix='./install_me_here/usr'
 installprefixexp='./install_me_here/usr'
-installprivlib='./install_me_here/usr/lib/perl5/5.9.5'
+installprivlib='./install_me_here/usr/lib/perl5/5.10.0'
 installscript='./install_me_here/usr/bin'
-installsitearch='./install_me_here/usr/lib/perl5/site_perl/5.9.5/armv4l-linux'
+installsitearch='./install_me_here/usr/lib/perl5/site_perl/5.10.0/armv4l-linux'
 installsitebin='./install_me_here/usr/bin'
 installsitehtml1dir=''
 installsitehtml3dir=''
-installsitelib='./install_me_here/usr/lib/perl5/site_perl/5.9.5'
+installsitelib='./install_me_here/usr/lib/perl5/site_perl/5.10.0'
 installsiteman1dir='./install_me_here/usr/share/man/man1'
 installsiteman3dir='./install_me_here/usr/share/man/man3'
 installsitescript='./install_me_here/usr/bin'
@@ -838,8 +838,8 @@ pmake=''
 pr=''
 prefix='/usr'
 prefixexp='/usr'
-privlib='/usr/lib/perl5/5.9.5'
-privlibexp='/usr/lib/perl5/5.9.5'
+privlib='/usr/lib/perl5/5.10.0'
+privlibexp='/usr/lib/perl5/5.10.0'
 procselfexe='"/proc/self/exe"'
 prototype='define'
 ptrsize='4'
@@ -900,17 +900,17 @@ sig_num='0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26
 sig_num_init='0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 6, 17, 29, 31, 0'
 sig_size='68'
 signal_t='void'
-sitearch='/usr/lib/perl5/site_perl/5.9.5/armv4l-linux'
-sitearchexp='/usr/lib/perl5/site_perl/5.9.5/armv4l-linux'
+sitearch='/usr/lib/perl5/site_perl/5.10.0/armv4l-linux'
+sitearchexp='/usr/lib/perl5/site_perl/5.10.0/armv4l-linux'
 sitebin='/usr/bin'
 sitebinexp='/usr/bin'
 sitehtml1dir=''
 sitehtml1direxp=''
 sitehtml3dir=''
 sitehtml3direxp=''
-sitelib='/usr/lib/perl5/site_perl/5.9.5'
+sitelib='/usr/lib/perl5/site_perl/5.10.0'
 sitelib_stem='/usr/lib/perl5/site_perl'
-sitelibexp='/usr/lib/perl5/site_perl/5.9.5'
+sitelibexp='/usr/lib/perl5/site_perl/5.10.0'
 siteman1dir='/usr/share/man/man1'
 siteman1direxp='/usr/share/man/man1'
 siteman3dir='/usr/share/man/man3'
@@ -1032,7 +1032,7 @@ vendorprefix=''
 vendorprefixexp=''
 vendorscript=''
 vendorscriptexp=''
-version='5.9.5'
+version='5.10.0'
 version_patchlevel_string='version 9 subversion 4'
 versiononly='undef'
 vi=''
diff --git a/NetWare/Makefile b/NetWare/Makefile
index eb792117fe..a6dd9520af 100644
--- a/NetWare/Makefile
+++ b/NetWare/Makefile
@@ -86,7 +86,7 @@ NLM_VERSION    = 3,20,0
 
 
 # Here comes the CW tools - TO BE FILLED TO BUILD WITH CW -
-MODULE_DESC     = "Perl 5.9.5 for NetWare"
+MODULE_DESC     = "Perl 5.10.0 for NetWare"
 CCTYPE          = CodeWarrior
 C_COMPILER		= mwccnlm -c
 CPP_COMPILER	= mwccnlm
@@ -463,7 +463,7 @@ INST_NW_TOP2 = $(INST_NW_DRV)\perl
 # versioned installation can be obtained by setting INST_TOP above to a
 # path that includes an arbitrary version string.
 #
-INST_VER	= \5.9.5
+INST_VER	= \5.10.0
 
 #
 # Comment this out if you DON'T want your perl installation to have
diff --git a/NetWare/config_H.wc b/NetWare/config_H.wc
index 36de52f41b..74c05a73d4 100644
--- a/NetWare/config_H.wc
+++ b/NetWare/config_H.wc
@@ -1042,7 +1042,7 @@
  *	This symbol contains the ~name expanded version of ARCHLIB, to be used
  *	in programs that are not prepared to deal with ~ expansion at run-time.
  */
-#define ARCHLIB "c:\\perl\\5.9.5\\lib\\NetWare-x86-multi-thread"		/**/
+#define ARCHLIB "c:\\perl\\5.10.0\\lib\\NetWare-x86-multi-thread"		/**/
 /*#define ARCHLIB_EXP ""	/**/
 
 /* ARCHNAME:
@@ -1073,8 +1073,8 @@
  *	This symbol is the filename expanded version of the BIN symbol, for
  *	programs that do not want to deal with that at run-time.
  */
-#define BIN "c:\\perl\\5.9.5\\bin\\NetWare-x86-multi-thread"	/**/
-#define BIN_EXP "c:\\perl\\5.9.5\\bin\\NetWare-x86-multi-thread"	/**/
+#define BIN "c:\\perl\\5.10.0\\bin\\NetWare-x86-multi-thread"	/**/
+#define BIN_EXP "c:\\perl\\5.10.0\\bin\\NetWare-x86-multi-thread"	/**/
 
 /* BYTEORDER:
  *	This symbol holds the hexadecimal constant defined in byteorder,
@@ -3036,7 +3036,7 @@
  *	This symbol contains the ~name expanded version of SITEARCH, to be used
  *	in programs that are not prepared to deal with ~ expansion at run-time.
  */
-#define SITEARCH "c:\\perl\\site\\5.9.5\\lib\\NetWare-x86-multi-thread"		/**/
+#define SITEARCH "c:\\perl\\site\\5.10.0\\lib\\NetWare-x86-multi-thread"		/**/
 /*#define SITEARCH_EXP ""	/**/
 
 /* SITELIB:
@@ -3059,8 +3059,8 @@
  *	removed.  The elements in inc_version_list (inc_version_list.U) can
  *	be tacked onto this variable to generate a list of directories to search.
  */
-#define SITELIB "c:\\perl\\site\\5.9.5\\lib"		/**/
-#define SITELIB_EXP (nw_get_sitelib("5.9.5"))	/**/
+#define SITELIB "c:\\perl\\site\\5.10.0\\lib"		/**/
+#define SITELIB_EXP (nw_get_sitelib("5.10.0"))	/**/
 #define SITELIB_STEM ""		/**/
 
 /* Size_t_size:
diff --git a/epoc/config.sh b/epoc/config.sh
index 1971ff3451..6abb491602 100644
--- a/epoc/config.sh
+++ b/epoc/config.sh
@@ -33,8 +33,8 @@ apirevision=''
 apisubversion=''
 apiversion=''
 ar='arm-epoc-pe-ar'
-archlib='/usr/lib/perl/5.9.5/epoc'
-archlibexp='/usr/lib/perl/5.9.5/epoc'
+archlib='/usr/lib/perl/5.10.0/epoc'
+archlibexp='/usr/lib/perl/5.10.0/epoc'
 archname64=''
 archname='epoc'
 archobjs='epoc.o epocish.o epoc_stubs.o'
@@ -740,8 +740,8 @@ pmake=''
 pr=''
 prefix=''
 prefixexp=''
-privlib='/usr/lib/perl/5.9.5'
-privlibexp='/usr/lib/perl/5.9.5'
+privlib='/usr/lib/perl/5.10.0'
+privlibexp='/usr/lib/perl/5.10.0'
 procselfexe=''
 prototype='define'
 ptrsize='4'
@@ -796,11 +796,11 @@ sig_num='0'
 sig_num_init='0, 0'
 sig_size='1'
 signal_t='void'
-sitearch='/usr/lib/perl/site_perl/5.9.5/epoc'
-sitearchexp='/usr/lib/perl/site_perl/5.9.5/epoc'
-sitelib='/usr/lib/perl/site_perl/5.9.5/'
+sitearch='/usr/lib/perl/site_perl/5.10.0/epoc'
+sitearchexp='/usr/lib/perl/site_perl/5.10.0/epoc'
+sitelib='/usr/lib/perl/site_perl/5.10.0/'
 sitelib_stem='/usr/lib/perl/site_perl'
-sitelibexp='/usr/lib/perl/site_perl/5.9.5/'
+sitelibexp='/usr/lib/perl/site_perl/5.10.0/'
 siteprefix=''
 siteprefixexp=''
 sizesize='4'
@@ -881,7 +881,7 @@ vendorlib_stem=''
 vendorlibexp=''
 vendorprefix=''
 vendorprefixexp=''
-version='5.9.5'
+version='5.10.0'
 versiononly='undef'
 vi=''
 voidflags='15'
@@ -1013,7 +1013,7 @@ vendorlib_stem=''
 vendorlibexp=''
 vendorprefix=''
 vendorprefixexp=''
-version='5.9.5'
+version='5.10.0'
 vi=''
 voidflags='15'
 xlibpth=''
diff --git a/epoc/createpkg.pl b/epoc/createpkg.pl
index f6519a61c3..e735d4d581 100644
--- a/epoc/createpkg.pl
+++ b/epoc/createpkg.pl
@@ -3,7 +3,7 @@
 use File::Find;
 use Cwd;
 
-$VERSION="5.9.5";
+$VERSION="5.10.0";
 $EPOC_VERSION=1;
 
 
diff --git a/patchlevel.h b/patchlevel.h
index ec4ad7f71b..135f6091a4 100644
--- a/patchlevel.h
+++ b/patchlevel.h
@@ -14,8 +14,8 @@
  * exactly on the third column */
 
 #define PERL_REVISION	5		/* age */
-#define PERL_VERSION	9		/* epoch */
-#define PERL_SUBVERSION	5		/* generation */
+#define PERL_VERSION	10		/* epoch */
+#define PERL_SUBVERSION	0		/* generation */
 
 /* The following numbers describe the earliest compatible version of
    Perl ("compatibility" here being defined as sufficient binary/API
@@ -31,8 +31,8 @@
    to include in @INC.  See INSTALL for how this works.
 */
 #define PERL_API_REVISION	5	/* Adjust manually as needed.  */
-#define PERL_API_VERSION	9	/* Adjust manually as needed.  */
-#define PERL_API_SUBVERSION	5	/* Adjust manually as needed.  */
+#define PERL_API_VERSION	10	/* Adjust manually as needed.  */
+#define PERL_API_SUBVERSION	0	/* Adjust manually as needed.  */
 /*
    XXX Note:  The selection of non-default Configure options, such
    as -Duselonglong may invalidate these settings.  Currently, Configure
diff --git a/plan9/config.plan9 b/plan9/config.plan9
index d194b8bbe7..8e50f3afb4 100644
--- a/plan9/config.plan9
+++ b/plan9/config.plan9
@@ -3364,8 +3364,8 @@
  *	This symbol contains the ~name expanded version of PRIVLIB, to be used
  *	in programs that are not prepared to deal with ~ expansion at run-time.
  */
-#define PRIVLIB "/sys/lib/perl/5.9.5"		/**/
-#define PRIVLIB_EXP "/sys/lib/perl/5.9.5"		/**/
+#define PRIVLIB "/sys/lib/perl/5.10.0"		/**/
+#define PRIVLIB_EXP "/sys/lib/perl/5.10.0"		/**/
 
 /* PTRSIZE:
  *	This symbol contains the size of a pointer, so that the C preprocessor
@@ -3492,9 +3492,9 @@
  *	removed.  The elements in inc_version_list (inc_version_list.U) can
  *	be tacked onto this variable to generate a list of directories to search.
  */
-#define SITELIB "/sys/lib/perl/5.9.5/site_perl"		/**/
-#define SITELIB_EXP "/sys/lib/perl/5.9.5/site_perl"		/**/
-#define SITELIB_STEM "/sys/lib/perl/5.9.5/site_perl"		/**/
+#define SITELIB "/sys/lib/perl/5.10.0/site_perl"		/**/
+#define SITELIB_EXP "/sys/lib/perl/5.10.0/site_perl"		/**/
+#define SITELIB_STEM "/sys/lib/perl/5.10.0/site_perl"		/**/
 
 /* Size_t_size:
  *	This symbol holds the size of a Size_t in bytes.
diff --git a/t/comp/use.t b/t/comp/use.t
index e66c4a39b5..41f3bde764 100755
--- a/t/comp/use.t
+++ b/t/comp/use.t
@@ -195,6 +195,11 @@ foreach my $index (-3..+3) {
 	    if ($index < 0) {
 		# Jiggle one of the parts down
 		--$parts[-$index - 1];
+		if ($parts[-$index - 1] < 0) {
+		    # perl's version number ends with '.0'
+		    $parts[-$index - 1] = 0;
+		    $parts[-$index - 2] -= 2;
+		}
 	    } else {
 		# Jiggle one of the parts up
 		++$parts[$index - 1];
diff --git a/t/op/ver.t b/t/op/ver.t
index 759104a7d6..d6b93e0075 100755
--- a/t/op/ver.t
+++ b/t/op/ver.t
@@ -203,7 +203,7 @@ is(v200, eval( "v200"), 'v200 eq "v200"'        );
 is(v200, eval("+v200"), 'v200 eq eval("+v200")' );
 
 # Tests for string/numeric value of $] itself
-my ($revision,$version,$subversion) = split '\.', sprintf("%vd",$^V);
+my ($revision,$version,$subversion) = split /\./, sprintf("%vd",$^V);
 
 # $^V always displays the leading 'v' but we don't want that here
 $revision =~ s/^v//;
@@ -217,11 +217,7 @@ my $v = sprintf("%d.%.3d%.3d",$revision,$version,$subversion);
 print "# v = '$v'\n";
 print "# ] = '$]'\n";
 
-$v =~ s/000$// if $subversion == 0;
-
-print "# v = '$v'\n";
-
-ok( $v eq "$]", qq{\$^V eq "\$]"});
+is( $v, "$]", qq{\$^V eq "\$]"});
 
 $v = $revision + $version/1000 + $subversion/1000000;
 
diff --git a/win32/Makefile b/win32/Makefile
index 0c479df89c..8e88bc9fb9 100644
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -32,7 +32,7 @@ INST_TOP	= $(INST_DRV)\perl
 # versioned installation can be obtained by setting INST_TOP above to a
 # path that includes an arbitrary version string.
 #
-#INST_VER	= \5.9.5
+#INST_VER	= \5.10.0
 
 #
 # Comment this out if you DON'T want your perl installation to have
diff --git a/win32/Makefile.ce b/win32/Makefile.ce
index 7503656a16..2d58100aee 100644
--- a/win32/Makefile.ce
+++ b/win32/Makefile.ce
@@ -6,7 +6,7 @@
 
 SRCDIR     = ..
 PV         = 59
-INST_VER   = 5.9.5
+INST_VER   = 5.10.0
 
 # INSTALL_ROOT specifies a path where this perl will be installed on CE device
 INSTALL_ROOT=/netzwerk/sprache/perl
diff --git a/win32/config_H.bc b/win32/config_H.bc
index daee5ca89e..c14c5b7c37 100644
--- a/win32/config_H.bc
+++ b/win32/config_H.bc
@@ -950,7 +950,7 @@
  *	This symbol contains the ~name expanded version of ARCHLIB, to be used
  *	in programs that are not prepared to deal with ~ expansion at run-time.
  */
-#define ARCHLIB "c:\\perl\\5.9.5\\lib\\MSWin32-x86"		/**/
+#define ARCHLIB "c:\\perl\\5.10.0\\lib\\MSWin32-x86"		/**/
 /*#define ARCHLIB_EXP ""	/**/
 
 /* ARCHNAME:
@@ -985,8 +985,8 @@
  *	This symbol, if defined, indicates that we'd like to relocate entries
  *	in @INC at run time based on the location of the perl binary.
  */
-#define BIN "c:\\perl\\5.9.5\\bin\\MSWin32-x86"	/**/
-#define BIN_EXP "c:\\perl\\5.9.5\\bin\\MSWin32-x86"	/**/
+#define BIN "c:\\perl\\5.10.0\\bin\\MSWin32-x86"	/**/
+#define BIN_EXP "c:\\perl\\5.10.0\\bin\\MSWin32-x86"	/**/
 /*#define PERL_RELOCATABLE_INC "" 		/**/
 
 /* INTSIZE:
@@ -4019,8 +4019,8 @@
  *	This symbol contains the ~name expanded version of PRIVLIB, to be used
  *	in programs that are not prepared to deal with ~ expansion at run-time.
  */
-#define PRIVLIB "c:\\perl\\5.9.5\\lib"		/**/
-#define PRIVLIB_EXP (win32_get_privlib("5.9.5"))	/**/
+#define PRIVLIB "c:\\perl\\5.10.0\\lib"		/**/
+#define PRIVLIB_EXP (win32_get_privlib("5.10.0"))	/**/
 
 /* CAN_PROTOTYPE:
  *	If defined, this macro indicates that the C compiler can handle
@@ -4154,7 +4154,7 @@
  *	This symbol contains the ~name expanded version of SITEARCH, to be used
  *	in programs that are not prepared to deal with ~ expansion at run-time.
  */
-#define SITEARCH "c:\\perl\\site\\5.9.5\\lib\\MSWin32-x86"		/**/
+#define SITEARCH "c:\\perl\\site\\5.10.0\\lib\\MSWin32-x86"		/**/
 /*#define SITEARCH_EXP ""	/**/
 
 /* SITELIB:
@@ -4177,8 +4177,8 @@
  *	removed.  The elements in inc_version_list (inc_version_list.U) can
  *	be tacked onto this variable to generate a list of directories to search.
  */
-#define SITELIB "c:\\perl\\site\\5.9.5\\lib"		/**/
-#define SITELIB_EXP (win32_get_sitelib("5.9.5"))	/**/
+#define SITELIB "c:\\perl\\site\\5.10.0\\lib"		/**/
+#define SITELIB_EXP (win32_get_sitelib("5.10.0"))	/**/
 #define SITELIB_STEM ""		/**/
 
 /* Size_t_size:
diff --git a/win32/config_H.ce b/win32/config_H.ce
index ab1bc33365..ce98d7d922 100644
--- a/win32/config_H.ce
+++ b/win32/config_H.ce
@@ -3348,7 +3348,7 @@
  *	in programs that are not prepared to deal with ~ expansion at run-time.
  */
 #define PRIVLIB "\\Storage Card\\perl58m\\lib"		/**/
-#define PRIVLIB_EXP (win32_get_privlib("5.9.5"))	/**/
+#define PRIVLIB_EXP (win32_get_privlib("5.10.0"))	/**/
 
 /* PTRSIZE:
  *	This symbol contains the size of a pointer, so that the C preprocessor
@@ -3479,7 +3479,7 @@
  *	be tacked onto this variable to generate a list of directories to search.
  */
 #define SITELIB "\\Storage Card\\perl58m\\site\\lib"		/**/
-#define SITELIB_EXP (win32_get_sitelib("5.9.5"))	/**/
+#define SITELIB_EXP (win32_get_sitelib("5.10.0"))	/**/
 #define SITELIB_STEM ""		/**/
 
 /* Size_t_size:
diff --git a/win32/config_H.gc b/win32/config_H.gc
index afea855be3..40da26cf84 100644
--- a/win32/config_H.gc
+++ b/win32/config_H.gc
@@ -950,7 +950,7 @@
  *	This symbol contains the ~name expanded version of ARCHLIB, to be used
  *	in programs that are not prepared to deal with ~ expansion at run-time.
  */
-#define ARCHLIB "c:\\perl\\5.9.5\\lib\\MSWin32-x86"		/**/
+#define ARCHLIB "c:\\perl\\5.10.0\\lib\\MSWin32-x86"		/**/
 /*#define ARCHLIB_EXP ""	/**/
 
 /* ARCHNAME:
@@ -985,8 +985,8 @@
  *	This symbol, if defined, indicates that we'd like to relocate entries
  *	in @INC at run time based on the location of the perl binary.
  */
-#define BIN "c:\\perl\\5.9.5\\bin\\MSWin32-x86"	/**/
-#define BIN_EXP "c:\\perl\\5.9.5\\bin\\MSWin32-x86"	/**/
+#define BIN "c:\\perl\\5.10.0\\bin\\MSWin32-x86"	/**/
+#define BIN_EXP "c:\\perl\\5.10.0\\bin\\MSWin32-x86"	/**/
 /*#define PERL_RELOCATABLE_INC "" 		/**/
 
 /* INTSIZE:
@@ -4049,8 +4049,8 @@
  *	This symbol contains the ~name expanded version of PRIVLIB, to be used
  *	in programs that are not prepared to deal with ~ expansion at run-time.
  */
-#define PRIVLIB "c:\\perl\\5.9.5\\lib"		/**/
-#define PRIVLIB_EXP (win32_get_privlib("5.9.5"))	/**/
+#define PRIVLIB "c:\\perl\\5.10.0\\lib"		/**/
+#define PRIVLIB_EXP (win32_get_privlib("5.10.0"))	/**/
 
 /* CAN_PROTOTYPE:
  *	If defined, this macro indicates that the C compiler can handle
@@ -4184,7 +4184,7 @@
  *	This symbol contains the ~name expanded version of SITEARCH, to be used
  *	in programs that are not prepared to deal with ~ expansion at run-time.
  */
-#define SITEARCH "c:\\perl\\site\\5.9.5\\lib\\MSWin32-x86"		/**/
+#define SITEARCH "c:\\perl\\site\\5.10.0\\lib\\MSWin32-x86"		/**/
 /*#define SITEARCH_EXP ""	/**/
 
 /* SITELIB:
@@ -4207,8 +4207,8 @@
  *	removed.  The elements in inc_version_list (inc_version_list.U) can
  *	be tacked onto this variable to generate a list of directories to search.
  */
-#define SITELIB "c:\\perl\\site\\5.9.5\\lib"		/**/
-#define SITELIB_EXP (win32_get_sitelib("5.9.5"))	/**/
+#define SITELIB "c:\\perl\\site\\5.10.0\\lib"		/**/
+#define SITELIB_EXP (win32_get_sitelib("5.10.0"))	/**/
 #define SITELIB_STEM ""		/**/
 
 /* Size_t_size:
diff --git a/win32/config_H.vc b/win32/config_H.vc
index 344fb7dd3b..1a02400848 100644
--- a/win32/config_H.vc
+++ b/win32/config_H.vc
@@ -950,7 +950,7 @@
  *	This symbol contains the ~name expanded version of ARCHLIB, to be used
  *	in programs that are not prepared to deal with ~ expansion at run-time.
  */
-#define ARCHLIB "c:\\perl\\5.9.5\\lib\\MSWin32-x86"		/**/
+#define ARCHLIB "c:\\perl\\5.10.0\\lib\\MSWin32-x86"		/**/
 /*#define ARCHLIB_EXP ""	/**/
 
 /* ARCHNAME:
@@ -985,8 +985,8 @@
  *	This symbol, if defined, indicates that we'd like to relocate entries
  *	in @INC at run time based on the location of the perl binary.
  */
-#define BIN "c:\\perl\\5.9.5\\bin\\MSWin32-x86"	/**/
-#define BIN_EXP "c:\\perl\\5.9.5\\bin\\MSWin32-x86"	/**/
+#define BIN "c:\\perl\\5.10.0\\bin\\MSWin32-x86"	/**/
+#define BIN_EXP "c:\\perl\\5.10.0\\bin\\MSWin32-x86"	/**/
 /*#define PERL_RELOCATABLE_INC "" 		/**/
 
 /* INTSIZE:
@@ -4045,8 +4045,8 @@
  *	This symbol contains the ~name expanded version of PRIVLIB, to be used
  *	in programs that are not prepared to deal with ~ expansion at run-time.
  */
-#define PRIVLIB "c:\\perl\\5.9.5\\lib"		/**/
-#define PRIVLIB_EXP (win32_get_privlib("5.9.5"))	/**/
+#define PRIVLIB "c:\\perl\\5.10.0\\lib"		/**/
+#define PRIVLIB_EXP (win32_get_privlib("5.10.0"))	/**/
 
 /* CAN_PROTOTYPE:
  *	If defined, this macro indicates that the C compiler can handle
@@ -4180,7 +4180,7 @@
  *	This symbol contains the ~name expanded version of SITEARCH, to be used
  *	in programs that are not prepared to deal with ~ expansion at run-time.
  */
-#define SITEARCH "c:\\perl\\site\\5.9.5\\lib\\MSWin32-x86"		/**/
+#define SITEARCH "c:\\perl\\site\\5.10.0\\lib\\MSWin32-x86"		/**/
 /*#define SITEARCH_EXP ""	/**/
 
 /* SITELIB:
@@ -4203,8 +4203,8 @@
  *	removed.  The elements in inc_version_list (inc_version_list.U) can
  *	be tacked onto this variable to generate a list of directories to search.
  */
-#define SITELIB "c:\\perl\\site\\5.9.5\\lib"		/**/
-#define SITELIB_EXP (win32_get_sitelib("5.9.5"))	/**/
+#define SITELIB "c:\\perl\\site\\5.10.0\\lib"		/**/
+#define SITELIB_EXP (win32_get_sitelib("5.10.0"))	/**/
 #define SITELIB_STEM ""		/**/
 
 /* Size_t_size:
diff --git a/win32/config_H.vc64 b/win32/config_H.vc64
index f9708aeb14..bb3072c83c 100644
--- a/win32/config_H.vc64
+++ b/win32/config_H.vc64
@@ -950,7 +950,7 @@
  *	This symbol contains the ~name expanded version of ARCHLIB, to be used
  *	in programs that are not prepared to deal with ~ expansion at run-time.
  */
-#define ARCHLIB "c:\\perl\\5.9.5\\lib\\MSWin32-x86"		/**/
+#define ARCHLIB "c:\\perl\\5.10.0\\lib\\MSWin32-x86"		/**/
 /*#define ARCHLIB_EXP ""	/**/
 
 /* ARCHNAME:
@@ -985,8 +985,8 @@
  *	This symbol, if defined, indicates that we'd like to relocate entries
  *	in @INC at run time based on the location of the perl binary.
  */
-#define BIN "c:\\perl\\5.9.5\\bin\\MSWin32-x86"	/**/
-#define BIN_EXP "c:\\perl\\5.9.5\\bin\\MSWin32-x86"	/**/
+#define BIN "c:\\perl\\5.10.0\\bin\\MSWin32-x86"	/**/
+#define BIN_EXP "c:\\perl\\5.10.0\\bin\\MSWin32-x86"	/**/
 /*#define PERL_RELOCATABLE_INC "" 		/**/
 
 /* INTSIZE:
@@ -4019,8 +4019,8 @@
  *	This symbol contains the ~name expanded version of PRIVLIB, to be used
  *	in programs that are not prepared to deal with ~ expansion at run-time.
  */
-#define PRIVLIB "c:\\perl\\5.9.5\\lib"		/**/
-#define PRIVLIB_EXP (win32_get_privlib("5.9.5"))	/**/
+#define PRIVLIB "c:\\perl\\5.10.0\\lib"		/**/
+#define PRIVLIB_EXP (win32_get_privlib("5.10.0"))	/**/
 
 /* CAN_PROTOTYPE:
  *	If defined, this macro indicates that the C compiler can handle
@@ -4154,7 +4154,7 @@
  *	This symbol contains the ~name expanded version of SITEARCH, to be used
  *	in programs that are not prepared to deal with ~ expansion at run-time.
  */
-#define SITEARCH "c:\\perl\\site\\5.9.5\\lib\\MSWin32-x86"		/**/
+#define SITEARCH "c:\\perl\\site\\5.10.0\\lib\\MSWin32-x86"		/**/
 /*#define SITEARCH_EXP ""	/**/
 
 /* SITELIB:
@@ -4177,8 +4177,8 @@
  *	removed.  The elements in inc_version_list (inc_version_list.U) can
  *	be tacked onto this variable to generate a list of directories to search.
  */
-#define SITELIB "c:\\perl\\site\\5.9.5\\lib"		/**/
-#define SITELIB_EXP (win32_get_sitelib("5.9.5"))	/**/
+#define SITELIB "c:\\perl\\site\\5.10.0\\lib"		/**/
+#define SITELIB_EXP (win32_get_sitelib("5.10.0"))	/**/
 #define SITELIB_STEM ""		/**/
 
 /* Size_t_size:
diff --git a/win32/makefile.mk b/win32/makefile.mk
index fc0a2f7431..6d3016b53e 100644
--- a/win32/makefile.mk
+++ b/win32/makefile.mk
@@ -34,7 +34,7 @@ INST_TOP	*= $(INST_DRV)\perl
 # versioned installation can be obtained by setting INST_TOP above to a
 # path that includes an arbitrary version string.
 #
-#INST_VER	*= \5.9.5
+#INST_VER	*= \5.10.0
 
 #
 # Comment this out if you DON'T want your perl installation to have