up patchlevel to 74; introduce distinct archname for PERL_OBJECT

p4raw-id: //depot/perl@1491

5 files changed, 33 insertions, 27 deletions

diff --git a/win32/Makefile b/win32/Makefile
index 23a8b8811d..e144f7afe5 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.00473
+INST_VER	= \5.00474
 
 #
 # uncomment to enable threads-capabilities
@@ -139,11 +139,15 @@ USE_THREADS	= undef
 PROCESSOR_ARCHITECTURE	= x86
 !ENDIF
 
+!IF "$(OBJECT)" != ""
+ARCHNAME	= MSWin32-$(PROCESSOR_ARCHITECTURE)-object
+!ELSE
 !IF "$(USE_THREADS)" == "define"
 ARCHNAME	= MSWin32-$(PROCESSOR_ARCHITECTURE)-thread
 !ELSE
 ARCHNAME	= MSWin32-$(PROCESSOR_ARCHITECTURE)
 !ENDIF
+!ENDIF
 
 ARCHDIR		= ..\lib\$(ARCHNAME)
 COREDIR		= ..\lib\CORE
diff --git a/win32/config_H.bc b/win32/config_H.bc
index 8edaf2f51c..b404251e1b 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.00473\\bin\\MSWin32-x86"	/**/
-#define BIN_EXP "c:\\perl\\5.00473\\bin\\MSWin32-x86"	/**/
+#define BIN "c:\\perl\\5.00474\\bin\\MSWin32-x86"	/**/
+#define BIN_EXP "c:\\perl\\5.00474\\bin\\MSWin32-x86"	/**/
 
 /* CPPSTDIN:
  *	This symbol contains the first part of the string which will invoke
@@ -1829,7 +1829,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.00473\\lib\\MSWin32-x86"		/**/
+#define ARCHLIB "c:\\perl\\5.00474\\lib\\MSWin32-x86"		/**/
 /*#define ARCHLIB_EXP ""	/**/
 
 /* DLSYM_NEEDS_UNDERSCORE:
@@ -1875,8 +1875,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.00473\\lib"		/**/
-#define PRIVLIB_EXP (win32_get_privlib("5.00473"))	/**/
+#define PRIVLIB "c:\\perl\\5.00474\\lib"		/**/
+#define PRIVLIB_EXP (win32_get_privlib("5.00474"))	/**/
 
 /* SITEARCH:
  *	This symbol contains the name of the private library for this package.
@@ -1891,7 +1891,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.00473\\lib\\MSWin32-x86"		/**/
+#define SITEARCH "c:\\perl\\site\\5.00474\\lib\\MSWin32-x86"		/**/
 /*#define SITEARCH_EXP ""	/**/
 
 /* SITELIB:
@@ -1907,8 +1907,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.00473\\lib"		/**/
-#define SITELIB_EXP (win32_get_sitelib("5.00473"))	/**/
+#define SITELIB "c:\\perl\\site\\5.00474\\lib"		/**/
+#define SITELIB_EXP (win32_get_sitelib("5.00474"))	/**/
 
 /* STARTPERL:
  *	This variable contains the string to put in front of a perl
diff --git a/win32/config_H.gc b/win32/config_H.gc
index 7be147192a..34f1c70f8e 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.00473\\bin\\MSWin32-x86"	/**/
-#define BIN_EXP "c:\\perl\\5.00473\\bin\\MSWin32-x86"	/**/
+#define BIN "c:\\perl\\5.00474\\bin\\MSWin32-x86"	/**/
+#define BIN_EXP "c:\\perl\\5.00474\\bin\\MSWin32-x86"	/**/
 
 /* CPPSTDIN:
  *	This symbol contains the first part of the string which will invoke
@@ -1829,7 +1829,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.00473\\lib\\MSWin32-x86"		/**/
+#define ARCHLIB "c:\\perl\\5.00474\\lib\\MSWin32-x86"		/**/
 /*#define ARCHLIB_EXP ""	/**/
 
 /* DLSYM_NEEDS_UNDERSCORE:
@@ -1875,8 +1875,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.00473\\lib"		/**/
-#define PRIVLIB_EXP (win32_get_privlib("5.00473"))	/**/
+#define PRIVLIB "c:\\perl\\5.00474\\lib"		/**/
+#define PRIVLIB_EXP (win32_get_privlib("5.00474"))	/**/
 
 /* SITEARCH:
  *	This symbol contains the name of the private library for this package.
@@ -1891,7 +1891,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.00473\\lib\\MSWin32-x86"		/**/
+#define SITEARCH "c:\\perl\\site\\5.00474\\lib\\MSWin32-x86"		/**/
 /*#define SITEARCH_EXP ""	/**/
 
 /* SITELIB:
@@ -1907,8 +1907,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.00473\\lib"		/**/
-#define SITELIB_EXP (win32_get_sitelib("5.00473"))	/**/
+#define SITELIB "c:\\perl\\site\\5.00474\\lib"		/**/
+#define SITELIB_EXP (win32_get_sitelib("5.00474"))	/**/
 
 /* STARTPERL:
  *	This variable contains the string to put in front of a perl
diff --git a/win32/config_H.vc b/win32/config_H.vc
index 0ffcd7614b..df0cdd15c9 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.00473\\bin\\MSWin32-x86"	/**/
-#define BIN_EXP "c:\\perl\\5.00473\\bin\\MSWin32-x86"	/**/
+#define BIN "c:\\perl\\5.00474\\bin\\MSWin32-x86"	/**/
+#define BIN_EXP "c:\\perl\\5.00474\\bin\\MSWin32-x86"	/**/
 
 /* CPPSTDIN:
  *	This symbol contains the first part of the string which will invoke
@@ -1829,7 +1829,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.00473\\lib\\MSWin32-x86"		/**/
+#define ARCHLIB "c:\\perl\\5.00474\\lib\\MSWin32-x86"		/**/
 /*#define ARCHLIB_EXP ""	/**/
 
 /* DLSYM_NEEDS_UNDERSCORE:
@@ -1875,8 +1875,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.00473\\lib"		/**/
-#define PRIVLIB_EXP (win32_get_privlib("5.00473"))	/**/
+#define PRIVLIB "c:\\perl\\5.00474\\lib"		/**/
+#define PRIVLIB_EXP (win32_get_privlib("5.00474"))	/**/
 
 /* SITEARCH:
  *	This symbol contains the name of the private library for this package.
@@ -1891,7 +1891,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.00473\\lib\\MSWin32-x86"		/**/
+#define SITEARCH "c:\\perl\\site\\5.00474\\lib\\MSWin32-x86"		/**/
 /*#define SITEARCH_EXP ""	/**/
 
 /* SITELIB:
@@ -1907,8 +1907,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.00473\\lib"		/**/
-#define SITELIB_EXP (win32_get_sitelib("5.00473"))	/**/
+#define SITELIB "c:\\perl\\site\\5.00474\\lib"		/**/
+#define SITELIB_EXP (win32_get_sitelib("5.00474"))	/**/
 
 /* STARTPERL:
  *	This variable contains the string to put in front of a perl
diff --git a/win32/makefile.mk b/win32/makefile.mk
index 04cc02055f..e8714911e3 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.00473
+INST_VER	*= \5.00474
 
 #
 # uncomment to enable threads-capabilities
@@ -150,7 +150,9 @@ USE_THREADS	*= undef
 
 PROCESSOR_ARCHITECTURE *= x86
 
-.IF "$(USE_THREADS)" == "define"
+.IF "$(OBJECT)" != ""
+ARCHNAME	= MSWin32-$(PROCESSOR_ARCHITECTURE)-object
+.ELIF "$(USE_THREADS)" == "define"
 ARCHNAME	= MSWin32-$(PROCESSOR_ARCHITECTURE)-thread
 .ELSE
 ARCHNAME	= MSWin32-$(PROCESSOR_ARCHITECTURE)