misc win32 config tweaks

p4raw-id: //depot/perl@1573

6 files changed, 16 insertions, 13 deletions

diff --git a/win32/Makefile b/win32/Makefile
index e72963a7dd..aff3b0f4e5 100644
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -49,9 +49,10 @@ INST_VER	= \5.00475
 #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.
+# uncomment to enable use of PerlCRT.DLL when using the Visual C compiler.
+# Highly recommended.  It has patches that fix known bugs in MSCVRT.DLL.
+# You will need to download it from: http://www.activestate.com/<TBD>
+# and follow the directions in the package to install.
 #
 #USE_PERLCRT	= define
 
@@ -810,7 +811,6 @@ $(ERRNO_PM): $(PERLEXE) $(ERRNO)_pm.PL
 	cd ..\..\win32
 
 doc: $(PERLEXE)
-	copy ..\README.win32 ..\pod\perlwin32.pod
 	$(PERLEXE) -I..\lib ..\installhtml --podroot=.. --htmldir=./html \
 	    --podpath=pod:lib:ext:utils --htmlroot="file://$(INST_HTML::=|)" \
 	    --libpod=perlfunc:perlguts:perlvar:perlrun:perlop --recurse
@@ -819,6 +819,7 @@ utils: $(PERLEXE) $(X2P)
 	cd ..\utils
 	$(MAKE) PERL=$(MINIPERL)
 	cd ..\pod
+	copy ..\README.win32 .\perlwin32.pod
 	$(MAKE) -f ..\win32\pod.mak converters
 	cd ..\win32
 	$(PERLEXE) $(PL2BAT) $(UTILS)
diff --git a/win32/config.bc b/win32/config.bc
index 453b8042ec..76ee3e8779 100644
--- a/win32/config.bc
+++ b/win32/config.bc
@@ -548,7 +548,7 @@ usemymalloc='n'
 usenm='false'
 useopcode='true'
 useperlio='undef'
-useposix='false'
+useposix='true'
 usesfio='false'
 useshrplib='yes'
 usethreads='undef'
diff --git a/win32/config.gc b/win32/config.gc
index 3315b52076..158be331af 100644
--- a/win32/config.gc
+++ b/win32/config.gc
@@ -548,7 +548,7 @@ usemymalloc='n'
 usenm='false'
 useopcode='true'
 useperlio='undef'
-useposix='false'
+useposix='true'
 usesfio='false'
 useshrplib='yes'
 usethreads='undef'
diff --git a/win32/config.vc b/win32/config.vc
index f70663dfe6..295221bf33 100644
--- a/win32/config.vc
+++ b/win32/config.vc
@@ -548,7 +548,7 @@ usemymalloc='n'
 usenm='false'
 useopcode='true'
 useperlio='undef'
-useposix='false'
+useposix='true'
 usesfio='false'
 useshrplib='yes'
 usethreads='undef'
diff --git a/win32/config_h.PL b/win32/config_h.PL
index 62a83dcc4a..617b996cdb 100644
--- a/win32/config_h.PL
+++ b/win32/config_h.PL
@@ -12,8 +12,8 @@ while (@ARGV && $ARGV[0] =~ /^([\w_]+)=(.*)$/)
   shift(@ARGV);
  }
 my $patchlevel = $opt{INST_VER};
-$patchlevel = s|^[\\/]||;
-$patchlevel = s|~VERSION~|$]|g;
+$patchlevel =~ s|^[\\/]||;
+$patchlevel =~ s|~VERSION~|$]|g;
 $patchlevel ||= $];
 $patchlevel = qq["$patchlevel"];
 
diff --git a/win32/makefile.mk b/win32/makefile.mk
index 8e4b0a5b61..0f727dd622 100644
--- a/win32/makefile.mk
+++ b/win32/makefile.mk
@@ -57,9 +57,11 @@ CCTYPE		*= BORLAND
 #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.
+# uncomment to enable linking with setargv.obj under the Visual C
+# compiler. Setting this options enables perl to expand wildcards in
+# arguments, but it may be harder to use alternate methods like
+# File::DosGlob that are more powerful.  This option is supported only with
+# Visual C.
 #
 #USE_PERLCRT	*= define
 
@@ -973,13 +975,13 @@ $(ERRNO_PM): $(PERLEXE) $(ERRNO)_pm.PL
 	cd $(EXTDIR)\$(*B) && $(MAKE)
 
 doc: $(PERLEXE)
-	copy ..\README.win32 ..\pod\perlwin32.pod
 	$(PERLEXE) -I..\lib ..\installhtml --podroot=.. --htmldir=./html \
 	    --podpath=pod:lib:ext:utils --htmlroot="file://$(INST_HTML:s,:,|,)"\
 	    --libpod=perlfunc:perlguts:perlvar:perlrun:perlop --recurse
 
 utils: $(PERLEXE) $(X2P)
 	cd ..\utils && $(MAKE) PERL=$(MINIPERL)
+	copy ..\README.win32 ..\pod\perlwin32.pod
 	cd ..\pod && $(MAKE) -f ..\win32\pod.mak converters
 	$(PERLEXE) $(PL2BAT) $(UTILS)