Integrate mainline c. _69 to ansiperl

p4raw-id: //depot/ansiperl@1264

diff --cc win32/config_H.gc
index 6f9a382,d5ddf5d..b74a667
--- 1/win32/config_H.gc
--- 2/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.00468\\bin\\MSWin32-x86" /**/
- #define BIN_EXP "c:\\perl.gcc\\5.00468\\bin\\MSWin32-x86"     /**/
 -#define BIN "c:\\perl\\5.00469\\bin\\MSWin32-x86"     /**/
 -#define BIN_EXP "c:\\perl\\5.00469\\bin\\MSWin32-x86" /**/
++#define BIN "c:\\perl.gcc\\5.00469\\bin\\MSWin32-x86" /**/
++#define BIN_EXP "c:\\perl.gcc\\5.00469\\bin\\MSWin32-x86"     /**/
  
  /* CPPSTDIN:
   *    This symbol contains the first part of the string which will invoke
@@@ -1471,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.00468\\lib\\MSWin32-x86"             /**/
 -#define ARCHLIB "c:\\perl\\5.00469\\lib\\MSWin32-x86"         /**/
++#define ARCHLIB "c:\\perl.gcc\\5.00469\\lib\\MSWin32-x86"             /**/
  /*#define ARCHLIB_EXP ""      /**/
  
  /* CAT2:
@@@ -1773,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.00468\\lib"          /**/
- #define PRIVLIB_EXP (win32_get_privlib("5.00468"))    /**/
 -#define PRIVLIB "c:\\perl\\5.00469\\lib"              /**/
++#define PRIVLIB "c:\\perl.gcc\\5.00469\\lib"          /**/
+ #define PRIVLIB_EXP (win32_get_privlib("5.00469"))    /**/
  
  /* SIG_NAME:
   *    This symbol contains a list of signal names in order of
@@@ -1820,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.00468\\lib\\MSWin32-x86"              /**/
 -#define SITEARCH "c:\\perl\\site\\5.00469\\lib\\MSWin32-x86"          /**/
++#define SITEARCH "c:\\perl.gcc\\site\\5.00469\\lib\\MSWin32-x86"              /**/
  /*#define SITEARCH_EXP ""     /**/
  
  /* SITELIB:
@@@ -1836,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.00468\\lib"            /**/
- #define SITELIB_EXP (win32_get_sitelib("5.00468"))    /**/
 -#define SITELIB "c:\\perl\\site\\5.00469\\lib"                /**/
++#define SITELIB "c:\\perl.gcc\\site\\5.00469\\lib"            /**/
+ #define SITELIB_EXP (win32_get_sitelib("5.00469"))    /**/
  
  /* DLSYM_NEEDS_UNDERSCORE:
   *    This symbol, if defined, indicates that we need to prepend an

diff --cc win32/makefile.mk
Simple merge