From: Nick Ing-Simmons <nik@tiuk.ti.com>
Date: Tue, 23 Jun 1998 18:15:23 +0000 (+0000)
Subject: Integrate mainline c. 5.004_68 into ansiperl, mainly
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=ba7e4437aa27a0775f31400cfe7bcaf273e14ef3;p=p5sagit%2Fp5-mst-13.2.git

Integrate mainline c. 5.004_68 into ansiperl, mainly
so see what has changed...

p4raw-id: //depot/ansiperl@1208
---

ba7e4437aa27a0775f31400cfe7bcaf273e14ef3
diff --cc win32/config_H.gc
index 16fab75,7fde31a..6f9a382
--- a/win32/config_H.gc
+++ b/win32/config_H.gc
@@@ -34,8 -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.gcc\\5.00467\\bin\\MSWin32-x86"	/**/
- #define BIN_EXP "c:\\perl.gcc\\5.00467\\bin\\MSWin32-x86"	/**/
 -#define BIN "c:\\perl\\5.00468\\bin\\MSWin32-x86"	/**/
 -#define BIN_EXP "c:\\perl\\5.00468\\bin\\MSWin32-x86"	/**/
++#define BIN "c:\\perl.gcc\\5.00468\\bin\\MSWin32-x86"	/**/
++#define BIN_EXP "c:\\perl.gcc\\5.00468\\bin\\MSWin32-x86"	/**/
  
  /* CPPSTDIN:
   *	This symbol contains the first part of the string which will invoke
@@@ -1463,7 -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.gcc\\5.00467\\lib\\MSWin32-x86"		/**/
 -#define ARCHLIB "c:\\perl\\5.00468\\lib\\MSWin32-x86"		/**/
++#define ARCHLIB "c:\\perl.gcc\\5.00468\\lib\\MSWin32-x86"		/**/
  /*#define ARCHLIB_EXP ""	/**/
  
  /* CAT2:
@@@ -1765,8 -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.gcc\\5.00467\\lib"		/**/
- #define PRIVLIB_EXP (win32_get_privlib("5.00467"))	/**/
 -#define PRIVLIB "c:\\perl\\5.00468\\lib"		/**/
++#define PRIVLIB "c:\\perl.gcc\\5.00468\\lib"		/**/
+ #define PRIVLIB_EXP (win32_get_privlib("5.00468"))	/**/
  
  /* SIG_NAME:
   *	This symbol contains a list of signal names in order of
@@@ -1812,7 -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.gcc\\site\\5.00467\\lib\\MSWin32-x86"		/**/
 -#define SITEARCH "c:\\perl\\site\\5.00468\\lib\\MSWin32-x86"		/**/
++#define SITEARCH "c:\\perl.gcc\\site\\5.00468\\lib\\MSWin32-x86"		/**/
  /*#define SITEARCH_EXP ""	/**/
  
  /* SITELIB:
@@@ -1828,8 -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.gcc\\site\\5.00467\\lib"		/**/
- #define SITELIB_EXP (win32_get_sitelib("5.00467"))	/**/
 -#define SITELIB "c:\\perl\\site\\5.00468\\lib"		/**/
++#define SITELIB "c:\\perl.gcc\\site\\5.00468\\lib"		/**/
+ #define SITELIB_EXP (win32_get_sitelib("5.00468"))	/**/
  
  /* DLSYM_NEEDS_UNDERSCORE:
   *	This symbol, if defined, indicates that we need to prepend an
diff --cc win32/makefile.mk
index 35004f8,e99e80e..2b57423
--- a/win32/makefile.mk
+++ b/win32/makefile.mk
@@@ -12,9 -16,11 +16,11 @@@
  #
  # Set these to wherever you want "nmake install" to put your
  # newly built perl.
+ #
  INST_DRV	*= c:
 -INST_TOP	*= $(INST_DRV)\perl
 +INST_TOP	*= $(INST_DRV)\perl.gcc
  
+ #
  # Comment this out if you DON'T want your perl installation to be versioned.
  # This means that the new installation will overwrite any files from the
  # old installation at the same INST_TOP location.  Leaving it enabled is
@@@ -30,10 -38,11 +38,11 @@@ INST_VER	*= \5.0046
  
  #
  # uncomment one
+ #
  #CCTYPE		*= MSVC20
  #CCTYPE		*= MSVC
 -CCTYPE		*= BORLAND
 -#CCTYPE		*= GCC
 +#CCTYPE		*= BORLAND
 +CCTYPE		*= GCC
  
  #
  # uncomment next line if you want to use the perl object
@@@ -42,9 -52,17 +52,17 @@@
  
  #
  # uncomment next line if you want debug version of perl (big,slow)
+ #
 -#CFG		*= Debug
 +CFG		*= Debug
  
  #
+ # uncomment to enable use of PerlCRT.DLL.  Highly recommended.  It has
+ # patches that fix known bugs in MSCVRT.DLL.  You will need to download it
+ # from: <TBD> and follow the directions in the package to install.
+ #
+ #USE_PERLCRT	*= define
+ 
+ #
  # if you have the source for des_fcrypt(), uncomment this and make sure the
  # file exists (see README.win32).  File should be located at the perl
  # top level directory.