sundry win32 config tweaks

p4raw-id: //depot/perl@1321

10 files changed, 35 insertions, 29 deletions

diff --git a/win32/Makefile b/win32/Makefile
index 8cc01bb27a..715e496080 100644
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -25,7 +25,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.00469
+INST_VER	= \~VERSION~
 
 #
 # uncomment to enable threads-capabilities
diff --git a/win32/config.bc b/win32/config.bc
index d25e81544e..615ead8c1b 100644
--- a/win32/config.bc
+++ b/win32/config.bc
@@ -449,7 +449,7 @@ osvers='4.0'
 package='perl5'
 pager='more /e'
 passcat=''
-patchlevel='2'
+patchlevel='~PATCHLEVEL~'
 path_sep=';'
 perl='perl'
 perladmin=''
@@ -543,6 +543,7 @@ usethreads='undef'
 usevfork='false'
 usrinc='/usr/include'
 uuname=''
+version='~VERSION~'
 vi=''
 voidflags='15'
 xlibpth='/usr/lib/386 /lib/386'
diff --git a/win32/config.gc b/win32/config.gc
index 7cdeffe196..c31c53ada4 100644
--- a/win32/config.gc
+++ b/win32/config.gc
@@ -449,7 +449,7 @@ osvers='4.0'
 package='perl5'
 pager='more /e'
 passcat=''
-patchlevel='2'
+patchlevel='~PATCHLEVEL~'
 path_sep=';'
 perl='perl'
 perladmin=''
@@ -543,6 +543,7 @@ usethreads='undef'
 usevfork='false'
 usrinc='/usr/include'
 uuname=''
+version='~VERSION~'
 vi=''
 voidflags='15'
 xlibpth='/usr/lib/386 /lib/386'
diff --git a/win32/config.vc b/win32/config.vc
index 2364789157..1ecdd50cde 100644
--- a/win32/config.vc
+++ b/win32/config.vc
@@ -449,7 +449,7 @@ osvers='4.0'
 package='perl5'
 pager='more /e'
 passcat=''
-patchlevel='2'
+patchlevel='~PATCHLEVEL~'
 path_sep=';'
 perl='perl'
 perladmin=''
@@ -543,6 +543,7 @@ usethreads='undef'
 usevfork='false'
 usrinc='/usr/include'
 uuname=''
+version='~VERSION~'
 vi=''
 voidflags='15'
 xlibpth='/usr/lib/386 /lib/386'
diff --git a/win32/config_H.bc b/win32/config_H.bc
index 3d8501d825..1e29d62387 100644
--- a/win32/config_H.bc
+++ b/win32/config_H.bc
@@ -34,8 +34,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.00469\\bin\\MSWin32-x86"	/**/
-#define BIN_EXP "c:\\perl\\5.00469\\bin\\MSWin32-x86"	/**/
+#define BIN "c:\\perl\\5.00470\\bin\\MSWin32-x86"	/**/
+#define BIN_EXP "c:\\perl\\5.00470\\bin\\MSWin32-x86"	/**/
 
 /* CPPSTDIN:
  *	This symbol contains the first part of the string which will invoke
@@ -1471,7 +1471,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.00469\\lib\\MSWin32-x86"		/**/
+#define ARCHLIB "c:\\perl\\5.00470\\lib\\MSWin32-x86"		/**/
 /*#define ARCHLIB_EXP ""	/**/
 
 /* CAT2:
@@ -1773,8 +1773,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.00469\\lib"		/**/
-#define PRIVLIB_EXP (win32_get_privlib("5.00469"))	/**/
+#define PRIVLIB "c:\\perl\\5.00470\\lib"		/**/
+#define PRIVLIB_EXP (win32_get_privlib("5.00470"))	/**/
 
 /* SIG_NAME:
  *	This symbol contains a list of signal names in order of
@@ -1820,7 +1820,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.00469\\lib\\MSWin32-x86"		/**/
+#define SITEARCH "c:\\perl\\site\\5.00470\\lib\\MSWin32-x86"		/**/
 /*#define SITEARCH_EXP ""	/**/
 
 /* SITELIB:
@@ -1836,8 +1836,8 @@
  *	This symbol contains the ~name expanded version of SITELIB, to be used
  *	in programs that are not prepared to deal with ~ expansion at run-time.
  */
-#define SITELIB "c:\\perl\\site\\5.00469\\lib"		/**/
-#define SITELIB_EXP (win32_get_sitelib("5.00469"))	/**/
+#define SITELIB "c:\\perl\\site\\5.00470\\lib"		/**/
+#define SITELIB_EXP (win32_get_sitelib("5.00470"))	/**/
 
 /* DLSYM_NEEDS_UNDERSCORE:
  *	This symbol, if defined, indicates that we need to prepend an
diff --git a/win32/config_H.gc b/win32/config_H.gc
index d5ddf5d5b0..f11ca85ec8 100644
--- a/win32/config_H.gc
+++ b/win32/config_H.gc
@@ -34,8 +34,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.00469\\bin\\MSWin32-x86"	/**/
-#define BIN_EXP "c:\\perl\\5.00469\\bin\\MSWin32-x86"	/**/
+#define BIN "c:\\perl\\5.00470\\bin\\MSWin32-x86"	/**/
+#define BIN_EXP "c:\\perl\\5.00470\\bin\\MSWin32-x86"	/**/
 
 /* CPPSTDIN:
  *	This symbol contains the first part of the string which will invoke
@@ -1471,7 +1471,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.00469\\lib\\MSWin32-x86"		/**/
+#define ARCHLIB "c:\\perl\\5.00470\\lib\\MSWin32-x86"		/**/
 /*#define ARCHLIB_EXP ""	/**/
 
 /* CAT2:
@@ -1773,8 +1773,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.00469\\lib"		/**/
-#define PRIVLIB_EXP (win32_get_privlib("5.00469"))	/**/
+#define PRIVLIB "c:\\perl\\5.00470\\lib"		/**/
+#define PRIVLIB_EXP (win32_get_privlib("5.00470"))	/**/
 
 /* SIG_NAME:
  *	This symbol contains a list of signal names in order of
@@ -1820,7 +1820,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.00469\\lib\\MSWin32-x86"		/**/
+#define SITEARCH "c:\\perl\\site\\5.00470\\lib\\MSWin32-x86"		/**/
 /*#define SITEARCH_EXP ""	/**/
 
 /* SITELIB:
@@ -1836,8 +1836,8 @@
  *	This symbol contains the ~name expanded version of SITELIB, to be used
  *	in programs that are not prepared to deal with ~ expansion at run-time.
  */
-#define SITELIB "c:\\perl\\site\\5.00469\\lib"		/**/
-#define SITELIB_EXP (win32_get_sitelib("5.00469"))	/**/
+#define SITELIB "c:\\perl\\site\\5.00470\\lib"		/**/
+#define SITELIB_EXP (win32_get_sitelib("5.00470"))	/**/
 
 /* DLSYM_NEEDS_UNDERSCORE:
  *	This symbol, if defined, indicates that we need to prepend an
diff --git a/win32/config_H.vc b/win32/config_H.vc
index 09a6dbbe48..1678bcdfbe 100644
--- a/win32/config_H.vc
+++ b/win32/config_H.vc
@@ -34,8 +34,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.00469\\bin\\MSWin32-x86"	/**/
-#define BIN_EXP "c:\\perl\\5.00469\\bin\\MSWin32-x86"	/**/
+#define BIN "c:\\perl\\5.00470\\bin\\MSWin32-x86"	/**/
+#define BIN_EXP "c:\\perl\\5.00470\\bin\\MSWin32-x86"	/**/
 
 /* CPPSTDIN:
  *	This symbol contains the first part of the string which will invoke
@@ -1471,7 +1471,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.00469\\lib\\MSWin32-x86"		/**/
+#define ARCHLIB "c:\\perl\\5.00470\\lib\\MSWin32-x86"		/**/
 /*#define ARCHLIB_EXP ""	/**/
 
 /* CAT2:
@@ -1773,8 +1773,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.00469\\lib"		/**/
-#define PRIVLIB_EXP (win32_get_privlib("5.00469"))	/**/
+#define PRIVLIB "c:\\perl\\5.00470\\lib"		/**/
+#define PRIVLIB_EXP (win32_get_privlib("5.00470"))	/**/
 
 /* SIG_NAME:
  *	This symbol contains a list of signal names in order of
@@ -1820,7 +1820,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.00469\\lib\\MSWin32-x86"		/**/
+#define SITEARCH "c:\\perl\\site\\5.00470\\lib\\MSWin32-x86"		/**/
 /*#define SITEARCH_EXP ""	/**/
 
 /* SITELIB:
@@ -1836,8 +1836,8 @@
  *	This symbol contains the ~name expanded version of SITELIB, to be used
  *	in programs that are not prepared to deal with ~ expansion at run-time.
  */
-#define SITELIB "c:\\perl\\site\\5.00469\\lib"		/**/
-#define SITELIB_EXP (win32_get_sitelib("5.00469"))	/**/
+#define SITELIB "c:\\perl\\site\\5.00470\\lib"		/**/
+#define SITELIB_EXP (win32_get_sitelib("5.00470"))	/**/
 
 /* DLSYM_NEEDS_UNDERSCORE:
  *	This symbol, if defined, indicates that we need to prepend an
diff --git a/win32/config_h.PL b/win32/config_h.PL
index 26a2430fb0..62a83dcc4a 100644
--- a/win32/config_h.PL
+++ b/win32/config_h.PL
@@ -13,6 +13,7 @@ while (@ARGV && $ARGV[0] =~ /^([\w_]+)=(.*)$/)
  }
 my $patchlevel = $opt{INST_VER};
 $patchlevel = s|^[\\/]||;
+$patchlevel = s|~VERSION~|$]|g;
 $patchlevel ||= $];
 $patchlevel = qq["$patchlevel"];
 
diff --git a/win32/config_sh.PL b/win32/config_sh.PL
index 45c1ba4e27..59e64f9675 100644
--- a/win32/config_sh.PL
+++ b/win32/config_sh.PL
@@ -5,6 +5,8 @@ while (@ARGV && $ARGV[0] =~ /^([\w_]+)=(.*)$/)
   shift(@ARGV);
  }
 
+$opt{VERSION} = $];
+$opt{INST_VER} =~ s|~VERSION~|$]|g;
 if ($] =~ /\.(\d\d\d)?(\d\d)?$/) { # should always be true
   $opt{PATCHLEVEL} = int($1 || 0);
   $opt{SUBVERSION} = $2 || '00';
diff --git a/win32/makefile.mk b/win32/makefile.mk
index 60fc2e7d92..87c0e6f9db 100644
--- a/win32/makefile.mk
+++ b/win32/makefile.mk
@@ -29,7 +29,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.00469
+INST_VER	*= \~VERSION~
 
 #
 # uncomment to enable threads-capabilities