Integrate mainline c. _69 to ansiperl

p4raw-id: //depot/ansiperl@1264

diff --git a/win32/config_H.gc b/win32/config_H.gc
index d5ddf5d..b74a667 100644 (file)
--- a/win32/config_H.gc
+++ b/win32/config_H.gc
@@ -14,7 +14,7 @@
  * Package name      : perl5
  * Source directory  : 
  * Configuration time: undef
- * Configured by     : gsar
+ * Configured by     : nick
  * Target system     : 
  */
 
@@ -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.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 @@
  *     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.gcc\\5.00469\\lib\\MSWin32-x86"              /**/
 /*#define ARCHLIB_EXP ""       /**/
 
 /* CAT2:
@@ -1773,7 +1773,7 @@
  *     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 "c:\\perl.gcc\\5.00469\\lib"           /**/
 #define PRIVLIB_EXP (win32_get_privlib("5.00469"))     /**/
 
 /* SIG_NAME:
@@ -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.gcc\\site\\5.00469\\lib\\MSWin32-x86"               /**/
 /*#define SITEARCH_EXP ""      /**/
 
 /* SITELIB:
@@ -1836,7 +1836,7 @@
  *     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 "c:\\perl.gcc\\site\\5.00469\\lib"             /**/
 #define SITELIB_EXP (win32_get_sitelib("5.00469"))     /**/
 
 /* DLSYM_NEEDS_UNDERSCORE:

diff --git a/win32/makefile.mk b/win32/makefile.mk
index 60fc2e7..e088db4 100644 (file)
--- a/win32/makefile.mk
+++ b/win32/makefile.mk
@@ -18,7 +18,7 @@
 # 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.
@@ -41,8 +41,8 @@ INST_VER      *= \5.00469
 #
 #CCTYPE                *= MSVC20
 #CCTYPE                *= MSVC
-CCTYPE         *= BORLAND
-#CCTYPE                *= GCC
+#CCTYPE                *= BORLAND
+CCTYPE         *= GCC
 
 #
 # uncomment next line if you want to use the perl object
@@ -53,7 +53,7 @@ CCTYPE                *= BORLAND
 #
 # 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
@@ -89,15 +89,15 @@ CCTYPE              *= BORLAND
 # set the install locations of the compiler include/libraries
 #
 #CCHOME                *= f:\msdev\vc
-CCHOME         *= C:\bc5
-#CCHOME                *= D:\packages\mingw32
+#CCHOME                *= C:\bc5
+CCHOME         *= C:\mingw32
 CCINCDIR       *= $(CCHOME)\include
 CCLIBDIR       *= $(CCHOME)\lib
 
 #
 # specify space-separated list of extra directories to look for libraries
 #
-EXTRALIBDIRS   *=
+EXTRALIBDIRS   *= $(CCHOME)\i386-mingw32\lib
 
 #
 # set this to point to cmd.exe (only needed if you use some
@@ -194,8 +194,8 @@ LIBOUT_FLAG =
 
 .ELIF "$(CCTYPE)" == "GCC"
 
-CC             = gcc -pipe
-LINK32         = gcc -pipe
+CC             = gcc 
+LINK32         = gcc 
 LIB32          = ar rc
 IMPLIB         = dlltool
 
@@ -418,6 +418,8 @@ PERLDLL             = ..\perl.dll
 CAPILIB                =
 .ENDIF
 
+
+
 XCOPY          = xcopy /f /r /i /d
 RCOPY          = xcopy /f /r /i /e /d
 NOOP           = @echo
@@ -543,7 +545,7 @@ CORE_H              = $(CORE_NOCFG_H) .\config.h
 MICROCORE_OBJ  = $(MICROCORE_SRC:db:+$(o))
 CORE_OBJ       = $(MICROCORE_OBJ) $(EXTRACORE_SRC:db:+$(o))
 WIN32_OBJ      = $(WIN32_SRC:db:+$(o))
-MINICORE_OBJ   = $(MINIDIR)\{$(MICROCORE_OBJ:f) miniperlmain$(o) perlio$(o)}
+MINICORE_OBJ   = $(MINIDIR)\{$(MICROCORE_OBJ:f) miniperlmain$(o) $(EXTRACORE_SRC:db:+$(o))}
 MINIWIN32_OBJ  = $(MINIDIR)\{$(WIN32_OBJ:f)}
 MINI_OBJ       = $(MINICORE_OBJ) $(MINIWIN32_OBJ)
 PERL95_OBJ     = $(PERL95_SRC:db:+$(o))