[inseparable changes from patch from perl-5.003_97d to perl-5.003_97e]perl-5.003_97e

 CORE LANGUAGE CHANGES

Subject: New operator: sysseek()
From: Chip Salzenberg <chip@perl.com>
Files: doio.c ext/Opcode/Makefile.PL ext/Opcode/Opcode.pm global.sym keywords.pl opcode.pl pod/perldelta.pod pod/perlfunc.pod pp_sys.c t/op/sysio.t toke.c

Subject: Allow recursive substitution again
From: Chip Salzenberg <chip@perl.com>
Files: pod/perldelta.pod pod/perldiag.pod pp_hot.c

 CORE PORTABILITY

Subject: Use size_t for socket size parameters of GNU libc
From: Chip Salzenberg <chip@perl.com>
Files: doio.c pp_sys.c

Subject: Win32 update (four patches)
From: Gurusamy Sarathy <gsar@engin.umich.edu>
Files: MANIFEST README.win32 dosish.h ext/SDBM_File/Makefile.PL ext/SDBM_File/sdbm/Makefile.PL ext/SDBM_File/sdbm/sdbm.c ext/SDBM_File/sdbm/sdbm.h lib/ExtUtils/MM_Unix.pm perl.c utils/perlbug.PL utils/perldoc.PL win32/Makefile win32/TEST win32/config.H win32/config.w32 win32/config_h.PL win32/config_sh.PL win32/perllib.c win32/runperl.c win32/win32.c win32/win32io.c win32/win32sck.c

 DOCUMENTATION

Subject: Add CGI to perldelta.pod and improve its description in MANIFEST
From: Chip Salzenberg <chip@perl.com>
Files: MANIFEST pod/perldelta.pod

Subject: Describe probs with majordomo 1.94.1
From: Chip Salzenberg <chip@perl.com>
Files: pod/perldelta.pod

Subject: Fix description of /\G/g
From: Chip Salzenberg <chip@perl.com>
Files: pod/perlop.pod

Subject: Mention '...' operator in precedence table
Date: Sun, 13 Apr 1997 11:24:16 -0600
From: Tom Christiansen <tchrist@perl.com>
Files: pod/perlop.pod

    private-msgid: 199704131724.LAA23120@jhereg.perl.com

 OTHER CORE CHANGES

Subject: New API function: perl_eval_pv()
Date: Mon, 14 Apr 1997 17:13:41 -0400
From: Doug MacEachern <dougm@opengroup.org>
Files: perl.c pod/perlcall.pod pod/perldelta.pod pod/perlembed.pod pod/perlguts.pod proto.h

    private-msgid: 199704142113.RAA06823@postman.osf.org

Subject: Fix C< s//whatever/ >, which reuses old pattern
From: Chip Salzenberg <chip@perl.com>
Files: pp_hot.c regexec.c

1 files changed, 245 insertions, 102 deletions

diff --git a/win32/Makefile b/win32/Makefile
index 3da20e77aa..0e7068fa6d 100644
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -5,25 +5,81 @@
 # This is set up to build a perl.exe that runs off a shared library
 # (perl.dll).  Also makes individual DLLs for the XS extensions.
 #
-# There's no support for building an all-static perl yet.
-# Doesn't build any of the stuff in ..\utils yet.
-# No support for installing documentation, uh, yet.
+
+#
+# Set these to wherever you want "nmake install" to put your
+# newly built perl.
 #
 
+INST_DRV=c:
+INST_TOP=$(INST_DRV)\perl
+
+
+##################### CHANGE THESE ONLY IF YOU MUST #####################
+
+#
+# Programs to compile, build .lib files and link
+#
 
+CC=cl.exe
+LINK32=link.exe
+LIB32=$(LINK32) -lib
 #
-# Set this to wherever you want "nmake install" to put your
-# newly built perl.  If you change this, you better change
-# all occurrences of this prefix in $(INST_TOP)\lib\Config.pm
-# as well.
+# Options
+#
+PERLDLL  = -D "PERLDLL"
+RUNTIME  = -MD
+INCLUDES = -I ".\include" -I "." -I ".."
+#PCHFLAGS = -Fp"$(INTDIR)/modules.pch" -YX 
+DEFINES  = -D "WIN32" -D "_CONSOLE" -D "PERLDLL"
+SUBSYS   = console
+LIBFILES = kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib \
+		advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib 
+
+!IF "$(RUNTIME)" == "-MD"
+WINIOMAYBE =
+!ELSE
+WINIOMAYBE = win32io.obj
+!ENDIF
+
+!IF  "$(CFG)" == "Debug"
+!  IF "$(CCTYPE)" == "MSVC20"
+OPTIMIZE = -Od $(RUNTIME) -Z7 -D "_DEBUG"
+!  ELSE
+OPTIMIZE = -Od $(RUNTIME)d -Z7 -D "_DEBUG"
+!  ENDIF
+LINK_DBG = -pdb:$(*B).pdb
+!ELSE
+!  IF "$(CCTYPE)" == "MSVC20"
+OPTIMIZE = -Od $(RUNTIME) -D "NDEBUG"
+!  ELSE
+OPTIMIZE = -O2 $(RUNTIME) -D "NDEBUG"
+!  ENDIF
+LINK_DBG = -release
+!ENDIF
 
-INST_TOP=C:\perl
+CFLAGS   = -nologo -W3 $(INCLUDES) $(DEFINES) $(PCHFLAGS) $(OPTIMIZE)
+LINK_FLAGS  = -nologo $(LIBFILES) $(LINK_DBG) -machine:I386
+
+#################### do not edit below this line #######################
+############# NO USER-SERVICEABLE PARTS BEYOND THIS POINT ##############
+
+#
+# Rules
+# 
+.SUFFIXES : 
+.SUFFIXES : .c .obj .dll .lib .exe
+
+.c.obj:
+	$(CC) -c $(CFLAGS) -Fo$@ $<
+
+.obj.dll:
+	$(LINK32) -dll -subsystem:windows -implib:$(*B).lib -def:$(*B).def -out:$@ $(LINK_FLAGS) $< $(LIBPERL)  
 
-#################### do not edit below this line ########################
 #
 INST_BIN=$(INST_TOP)\bin
 INST_LIB=$(INST_TOP)\lib
-INST_POD=$(INST_TOP)\pod
+INST_POD=$(INST_LIB)\pod
 INST_HTML=$(INST_POD)\html
 LIBDIR=..\lib
 EXTDIR=..\ext
@@ -32,25 +88,24 @@ EXTUTILSDIR=$(LIBDIR)\extutils
 
 #
 # various targets
-PERLLIB=..\libperl.lib
 PERLIMPLIB=..\perl.lib
 MINIPERL=..\miniperl.exe
 PERLDLL=..\perl.dll
 PERLEXE=..\perl.exe
 GLOBEXE=..\perlglob.exe
+CONFIGPM=..\lib\Config.pm
 
 PL2BAT=bin\PL2BAT.BAT
-MAKE=nmake /nologo
+MAKE=nmake -nologo
 XCOPY=xcopy /i /d /f /r
 NULL=
 
 #
 # filenames given to xsubpp must have forward slashes (since it puts
 # full pathnames in #line strings)
-XSUBPP=..\$(MINIPERL) ..\$(EXTUTILSDIR)\xsubpp -C++ -prototypes
+XSUBPP=..\$(MINIPERL) -I..\..\lib ..\$(EXTUTILSDIR)\xsubpp -C++ -prototypes
 
-CORE_C=			\
-	..\av.c		\
+CORE_C=	..\av.c		\
 	..\deb.c	\
 	..\doio.c	\
 	..\doop.c	\
@@ -77,6 +132,78 @@ CORE_C=			\
 	..\universal.c	\
 	..\util.c
 
+CORE_OBJ=..\av.obj		\
+	..\deb.obj	\
+	..\doio.obj	\
+	..\doop.obj	\
+	..\dump.obj	\
+	..\globals.obj	\
+	..\gv.obj		\
+	..\hv.obj		\
+	..\mg.obj		\
+	..\op.obj		\
+	..\perl.obj	\
+	..\perlio.obj	\
+	..\perly.obj	\
+	..\pp.obj		\
+	..\pp_ctl.obj	\
+	..\pp_hot.obj	\
+	..\pp_sys.obj	\
+	..\regcomp.obj	\
+	..\regexec.obj	\
+	..\run.obj	\
+	..\scope.obj	\
+	..\sv.obj		\
+	..\taint.obj	\
+	..\toke.obj	\
+	..\universal.obj	\
+	..\util.obj
+
+WIN32_C = perllib.c \
+	win32.c \
+	win32io.c \
+	win32sck.c \
+
+WIN32_OBJ = win32.obj \
+	win32io.obj \
+	win32sck.obj \
+
+DLL_OBJ = perllib.obj $(DYNALOADER).obj
+
+CORE_H = "..\av.h"\
+	"..\cop.h"\
+	"..\cv.h"\
+	"..\dosish.h"\
+	"..\embed.h"\
+	"..\form.h"\
+	"..\gv.h"\
+	"..\handy.h"\
+	"..\hv.h"\
+	"..\mg.h"\
+	"..\nostdio.h"\
+	"..\op.h"\
+	"..\opcode.h"\
+	"..\perl.h"\
+	"..\perlio.h"\
+	"..\perlsdio.h"\
+	"..\perlsfio.h"\
+	"..\perly.h"\
+	"..\pp.h"\
+	"..\proto.h"\
+	"..\regexp.h"\
+	"..\scope.h"\
+	"..\sv.h"\
+	"..\unixish.h"\
+	"..\util.h"\
+	"..\XSUB.h"\
+	".\config.h"\
+	"..\EXTERN.h"\
+	".\include\dirent.h"\
+	".\include\netdb.h"\
+	".\include\sys\socket.h"\
+	".\win32.h"
+
+
 EXTENSIONS=DynaLoader Socket IO Fcntl Opcode SDBM_File
 
 DYNALOADER=$(EXTDIR)\DynaLoader\DynaLoader
@@ -105,54 +232,72 @@ POD2MAN=$(PODDIR)\pod2man
 POD2LATEX=$(PODDIR)\pod2latex
 POD2TEXT=$(PODDIR)\pod2text
 
-ALL: $(PERLEXE) $(GLOBEXE) $(DYNALOADMODULES)
+#
+# Top targets
+#
 
-!IF "$(CFG)" ==""
-CFG=Release
-!ENDIF
+ALL: $(PERLEXE) $(GLOBEXE) $(DYNALOADMODULES) 
 
-modules.lib : $(DYNALOADER).c
-	$(MAKE) -A -f modules.mak CFG="modules - Win32 $(CFG)"
+$(DYNALOADER).obj : $(DYNALOADER).c $(CORE_H) $(EXTDIR)\DynaLoader\dlutils.c
 
-$(GLOBEXE):
-	$(MAKE) -f perlglob.mak CFG="perlglob - Win32 Release"
+#------------------------------------------------------------
 
-$(PERLLIB): $(CORE_C)
-	$(MAKE) -f libperl.mak CFG="libperl - Win32 $(CFG)"
+$(GLOBEXE): perlglob.obj
+	$(LINK32) $(LINK_FLAGS) -out:$@ -subsystem:$(SUBSYS) perlglob.obj setargv.obj 
 
-$(MINIPERL): $(PERLLIB)
-	$(MAKE) -A -f miniperl.mak CFG="miniperl - Win32 $(CFG)"
-	copy config.w32 ..\config.sh
-	cd ..
-	miniperl configpm
-	cd win32
+perlglob.obj  : perlglob.c
+
+..\miniperlmain.obj : ..\miniperlmain.c $(CORE_H)
+
+..\config.sh : config.w32 $(MINIPERL) config_sh.PL
+	$(MINIPERL) -I..\lib config_sh.PL "INST_DRV=$(INST_DRV)" "INST_TOP=$(INST_TOP)"\
+	"cc=$(CC)" "ccflags=$(RUNTIME) -DWIN32" config.w32 > ..\config.sh
+
+$(CONFIGPM) : $(MINIPERL) ..\config.sh config_h.PL
+	cd .. && miniperl configpm
 	if exist lib\* $(XCOPY) /e lib\*.* ..\lib\$(NULL)
-	copy bin\test.bat ..\t
+	$(XCOPY) ..\*.h ..\lib\CORE\*.*
+	$(XCOPY) *.h ..\lib\CORE\*.*
+	$(XCOPY) /S include ..\lib\CORE\*.*
+	$(MINIPERL) -I..\lib config_h.PL || $(MAKE) RUNTIME=$(RUNTIME) CFG=$(CFG) $(CONFIGPM)
+
+$(MINIPERL) : ..\miniperlmain.obj $(CORE_OBJ) $(WIN32_OBJ)
+	$(LINK32) -subsystem:console -out:$@ @<<
+		$(LINK_FLAGS) ..\miniperlmain.obj $(CORE_OBJ) $(WIN32_OBJ)
+<<
+
+$(WIN32_OBJ) : $(CORE_H)
+$(CORE_OBJ)  : $(CORE_H)
+$(DLL_OBJ)   : $(CORE_H) 
 
-$(PERLDLL): $(MINIPERL) $(PERLLIB)
+perldll.def : $(MINIPERL) $(CONFIGPM)
 	$(MINIPERL) -w makedef.pl > perldll.def
-	$(MAKE) -A -f perldll.mak CFG="perldll - Win32 $(CFG)"
 
-$(PERLEXE): $(MINIPERL) modules.lib $(PERLDLL)
-#	$(MINIPERL) makemain.pl $(STATICLINKMODUES) > perlmain.c
-#	$(MINIPERL) makeperldef.pl $(STATICLINKMODUES) > perl.def
-	$(MINIPERL) makeperldef.pl $(NULL) > perl.def
+$(PERLDLL): perldll.def $(CORE_OBJ) $(WIN32_OBJ) $(DLL_OBJ)
+	$(LINK32) -dll -def:perldll.def -out:$@ @<<
+		$(LINK_FLAGS) $(CORE_OBJ) $(WIN32_OBJ) $(DLL_OBJ)
+<<
+	$(XCOPY) $(PERLIMPLIB) ..\lib\CORE
+
+perl.def  : $(MINIPERL) makeperldef.pl
+	$(MINIPERL) -I..\lib makeperldef.pl $(NULL) > perl.def
+
+perlmain.c : runperl.c
 	copy runperl.c perlmain.c
-	$(MAKE) -A -f perl.mak CFG="perl - Win32 $(CFG)"
-	copy ..\_perl.exe $(PERLEXE)
-	del ..\_perl.exe
-	del ..\*.exp
+
+perlmain.obj : perlmain.c
+	$(CC) $(CFLAGS) -U "PERLDLL" -c perlmain.c
+
+$(PERLEXE): $(PERLDLL) $(CONFIGPM) perlmain.obj  
+	$(LINK32) -subsystem:console -out:perl.exe $(LINK_FLAGS) perlmain.obj $(WINIOMAYBE) $(PERLIMPLIB) 
+	copy perl.exe $@
+	del perl.exe
 	copy splittree.pl .. 
-	$(MINIPERL) ..\splittree.pl "../LIB" "../LIB/auto"
+	$(MINIPERL) -I..\lib ..\splittree.pl "../LIB" "../LIB/auto"
 	attrib -r ..\t\*.*
 	copy test ..\t
-	$(XCOPY) ..\*.h ..\lib\CORE\*.*
-	$(XCOPY) $(PERLIMPLIB) ..\lib\CORE
-	$(XCOPY) $(PERLLIB) ..\lib\CORE
-	$(XCOPY) *.h ..\lib\CORE
-	$(XCOPY) /S include ..\lib\CORE
 
-$(DYNALOADER).c: $(EXTDIR)\DynaLoader\dl_win32.xs
+$(DYNALOADER).c: $(MINIPERL) $(EXTDIR)\DynaLoader\dl_win32.xs $(CONFIGPM)
 	if not exist ..\lib\auto md ..\lib\auto
 	$(XCOPY) $(EXTDIR)\$(*B)\$(*B).pm $(LIBDIR)\$(NULL)
 	cd $(EXTDIR)\$(*B)
@@ -162,67 +307,40 @@ $(DYNALOADER).c: $(EXTDIR)\DynaLoader\dl_win32.xs
 $(EXTDIR)\DynaLoader\dl_win32.xs: dl_win32.xs
 	copy dl_win32.xs $(EXTDIR)\DynaLoader\dl_win32.xs
 
-$(SOCKET).c: $(SOCKET).xs
-	if not exist ..\lib\auto\$(*B) md ..\lib\auto\$(*B)
-	$(MINIPERL) genxsdef.pl $(*B) > $(*B).def
-	$(XCOPY) $(EXTDIR)\$(*B)\$(*B).pm $(LIBDIR)\$(NULL)
+$(IO_DLL): $(PERLEXE) $(CONFIGPM) $(IO).xs
 	cd $(EXTDIR)\$(*B)
-	$(XSUBPP) $(*B).xs > $(*B).c
+	..\..\miniperl -I..\..\lib Makefile.PL INSTALLDIRS=perl
+	$(MAKE)
 	cd ..\..\win32
 
-$(IO).c:  $(IO).xs
-	if not exist ..\lib\auto\$(*B) md ..\lib\auto\$(*B)
-	$(MINIPERL) genxsdef.pl $(*B) > $(*B).def
-	$(XCOPY) $(EXTDIR)\$(*B)\$(*B).pm $(LIBDIR)\$(NULL)
-	$(XCOPY) /s $(EXTDIR)\$(*B)\lib\*.* $(LIBDIR)
+$(SDBM_FILE_DLL) : $(PERLEXE) $(SDBM_FILE).xs
 	cd $(EXTDIR)\$(*B)
-	$(XSUBPP) $(*B).xs > $(*B).c
+	..\..\miniperl -I..\..\lib Makefile.PL INSTALLDIRS=perl
+	$(MAKE)
 	cd ..\..\win32
 
-$(SDBM_FILE).c:  $(SDBM_FILE).xs
-	if not exist ..\lib\auto\$(*B) md ..\lib\auto\$(*B)
-	$(MINIPERL) genxsdef.pl $(*B) > $(*B).def
-	$(XCOPY) $(EXTDIR)\$(*B)\$(*B).pm $(LIBDIR)\$(NULL)
+$(FCNTL_DLL): $(PERLEXE) $(FCNTL).xs
 	cd $(EXTDIR)\$(*B)
-	$(XSUBPP) -typemap ./typemap $(*B).xs > $(*B).c
+	..\..\miniperl -I..\..\lib Makefile.PL INSTALLDIRS=perl
+	$(MAKE)
 	cd ..\..\win32
 
-$(FCNTL).c:  $(FCNTL).xs
-	if not exist ..\lib\auto\$(*B) md ..\lib\auto\$(*B)
-	$(MINIPERL) genxsdef.pl $(*B) > $(*B).def
-	$(XCOPY) $(EXTDIR)\$(*B)\$(*B).pm $(LIBDIR)\$(NULL)
+$(OPCODE_DLL): $(PERLEXE) $(OPCODE).xs
 	cd $(EXTDIR)\$(*B)
-	$(XSUBPP) $(*B).xs > $(*B).c
+	..\..\miniperl -I..\..\lib Makefile.PL INSTALLDIRS=perl
+	$(MAKE)
 	cd ..\..\win32
 
-$(OPCODE).c:  $(OPCODE).xs
-	if not exist ..\lib\auto\$(*B) md ..\lib\auto\$(*B)
-	$(MINIPERL) genxsdef.pl $(*B) > $(*B).def
-	$(XCOPY) $(EXTDIR)\$(*B)\$(*B).pm $(LIBDIR)\$(NULL)
-	$(XCOPY) $(EXTDIR)\$(*B)\*.pm $(LIBDIR)\$(NULL)
+$(SOCKET_DLL): $(SOCKET).xs $(PERLEXE)
 	cd $(EXTDIR)\$(*B)
-	$(XSUBPP) $(*B).xs > $(*B).c
+	..\..\miniperl -I..\..\lib Makefile.PL INSTALLDIRS=perl
+	$(MAKE)
 	cd ..\..\win32
 
-$(SOCKET_DLL): $(SOCKET).c $(PERLDLL)
-	$(MAKE) -f $(*B).mak CFG="$(*B) - Win32 $(CFG)"
-
-$(IO_DLL): $(IO).c $(PERLDLL)
-	$(MAKE) -f $(*B).mak CFG="$(*B) - Win32 $(CFG)"
-
-$(SDBM_FILE_DLL): $(SDBM_FILE).c $(PERLDLL)
-	$(MAKE) -f $(*B).mak CFG="$(*B) - Win32 $(CFG)"
-
-$(FCNTL_DLL): $(FCNTL).c $(PERLDLL)
-	$(MAKE) -f $(*B).mak CFG="$(*B) - Win32 $(CFG)"
-
-$(OPCODE_DLL): $(OPCODE).c $(PERLDLL)
-	$(MAKE) -f $(*B).mak CFG="$(*B) - Win32 $(CFG)"
-
 doc: $(PERLEXE)
-        cd $(PODDIR)
-        nmake -f ../win32/pod.mak
-        cd ..\win32
+	cd $(PODDIR)
+	nmake -f ../win32/pod.mak
+	cd ..\win32
 
 utils: $(PERLEXE)
 	cd ..\utils
@@ -232,9 +350,9 @@ utils: $(PERLEXE)
 	$(XCOPY) *.bat ..\win32\bin\*.*
 	cd ..\win32
 
-distclean:
-	-del /f $(MINIPERL) $(PERLEXE) $(PERLDLL) $(GLOBEXE) $(PERLLIB) \
-		$(PERLIMPLIB) ..\miniperl.lib modules.lib
+distclean: clean
+	-del /f $(MINIPERL) $(PERLEXE) $(PERLDLL) $(GLOBEXE) \
+		$(PERLIMPLIB) ..\miniperl.lib 
 	-del /f *.def
 	-del /f $(SOCKET_DLL) $(IO_DLL) $(SDBM_FILE_DLL) $(FCNTL_DLL) \
 		$(OPCODE_DLL)
@@ -244,7 +362,6 @@ distclean:
 	-del /f $(PODDIR)\*.bat
 	-rmdir /s /q ..\lib\auto
 	-rmdir /s /q ..\lib\CORE
-	-rmdir /s /q release
 	-rmdir /s /q debug
 
 install : ALL doc utils
@@ -259,15 +376,41 @@ install : ALL doc utils
 	$(XCOPY) ..\pod\*.pod $(INST_POD)\*.*
 	$(XCOPY) ..\pod\*.html $(INST_HTML)\*.*
 
-inst_lib : 
+inst_lib : $(CONFIGPM)
 	copy splittree.pl .. 
-	$(MINIPERL) ..\splittree.pl "../LIB" "../LIB/auto"
+	$(MINIPERL) -I..\lib ..\splittree.pl "../LIB" "../LIB/auto"
 	$(XCOPY) /e ..\lib $(INST_LIB)\*.*
 
+minitest : $(MINIPERL) $(GLOBEXE) $(CONFIGPM)
+	$(XCOPY) $(MINIPERL) ..\t\perl.exe
+	$(XCOPY) $(GLOBEXE) ..\t\$(NULL)
+	attrib -r ..\t\*.*
+	copy test ..\t
+	cd ..\t
+	$(MINIPERL) -I..\lib test base/*.t comp/*.t cmd/*.t io/*.t op/*.t pragma/*.t
+	cd ..\win32
+
 test : all
 	$(XCOPY) $(PERLEXE) ..\t\$(NULL)
 	$(XCOPY) $(PERLDLL) ..\t\$(NULL)
 	$(XCOPY) $(GLOBEXE) ..\t\$(NULL)
-        cd ..\t
-        $(PERLEXE) test
+	cd ..\t
+	$(PERLEXE) -I..\lib harness
 	cd ..\win32
+
+clean : 
+	-@erase miniperlmain.obj
+	-@erase $(MINIPERL)
+	-@erase perlglob.obj
+	-@erase perlmain.obj
+	-@erase $(GLOBEXE)
+	-@erase $(PERLEXE)
+	-@erase $(PERLDLL)
+	-@erase $(CORE_OBJ)
+	-@erase $(WIN32_OBJ)
+	-@erase $(DLL_OBJ)
+	-@erase ..\*.obj *.obj ..\*.lib ..\*.exp
+	-@erase *.ilk
+	-@erase *.pdb
+
+