Abolish USE_WIN32_RTL_ENV.

[p5sagit/p5-mst-13.2.git] / win32 / Makefile

diff --git a/win32/Makefile b/win32/Makefile
index fe1b1b1..9049099 100644 (file)
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -31,7 +31,7 @@ INST_TOP      = $(INST_DRV)\perl
 # versioned installation can be obtained by setting INST_TOP above to a
 # path that includes an arbitrary version string.
 #
-INST_VER       = \5.7.0
+#INST_VER = \5.7.0
 
 #
 # Comment this out if you DON'T want your perl installation to have
@@ -42,33 +42,31 @@ INST_VER    = \5.7.0
 # the same location.  Commenting it out gives you a simpler
 # installation that is easier to understand for beginners.
 #
-INST_ARCH      = \$(ARCHNAME)
+#INST_ARCH = \$(ARCHNAME)
 
 #
 # uncomment to enable multiple interpreters.  This is need for fork()
 # emulation.
 #
-#USE_MULTI     = define
+USE_MULTI = define
 
 #
 # Beginnings of interpreter cloning/threads; still very incomplete.
 # This should be enabled to get the fork() emulation.  This needs
 # USE_MULTI as well.
 #
-#USE_ITHREADS  = define
+USE_ITHREADS = define
 
 #
 # uncomment to enable the implicit "host" layer for all system calls
 # made by perl.  This needs USE_MULTI above.  This is also needed to
 # get fork().
 #
-#USE_IMP_SYS   = define
+USE_IMP_SYS = define
 
 #
 # uncomment to enable the experimental PerlIO I/O subsystem.
-# This is currently incompatible with USE_MULTI, USE_ITHREADS,
-# and USE_IMP_SYS
-#USE_PERLIO    = define
+USE_PERLIO     = define
 
 #
 # WARNING! This option is deprecated and will eventually go away (enable
@@ -247,6 +245,10 @@ USE_ITHREADS       = undef
 USE_IMP_SYS    = undef
 !ENDIF
 
+!IF "$(USE_PERLIO)" == ""
+USE_PERLIO     = undef
+!ENDIF
+
 !IF "$(USE_PERLCRT)" == ""
 USE_PERLCRT    = undef
 !ENDIF
@@ -304,12 +306,6 @@ ARCHNAME   = $(ARCHNAME)-thread
 # VC 6.0 can load the socket dll on demand.  Makes the test suite
 # run in about 10% less time.
 DELAYLOAD      = -DELAYLOAD:wsock32.dll -DELAYLOAD:shell32.dll delayimp.lib
-
-# VC 6.0 seems capable of compiling perl correctly with optimizations
-# enabled.  Anything earlier fails tests.
-!IF "$(CFG)" == ""
-CFG            = Optimize
-!ENDIF
 !ENDIF
 
 ARCHDIR                = ..\lib\$(ARCHNAME)
@@ -327,7 +323,7 @@ INST_LIB    = $(INST_TOP)$(INST_VER)\lib
 INST_ARCHLIB   = $(INST_LIB)$(INST_ARCH)
 INST_COREDIR   = $(INST_ARCHLIB)\CORE
 INST_POD       = $(INST_LIB)\pod
-INST_HTML      = $(INST_POD)\html
+INST_HTML      = $(INST_TOP)$(INST_VER)\html
 
 #
 # Programs to compile, build .lib files and link
@@ -366,13 +362,9 @@ OPTIMIZE   = -Od -MD -Zi -DDEBUGGING
 !  ENDIF
 LINK_DBG       = -debug -pdb:none
 !ELSE
-!  IF  "$(CFG)" == "Optimize"
 # -O1 yields smaller code, which turns out to be faster than -O2
 #OPTIMIZE      = -O2 -MD -DNDEBUG
 OPTIMIZE       = -O1 -MD -DNDEBUG
-!  ELSE
-OPTIMIZE       = -Od -MD -DNDEBUG
-!  ENDIF
 LINK_DBG       = -release
 !ENDIF
 
@@ -739,6 +731,7 @@ CFG_VARS    =                                       \
                "useithreads=$(USE_ITHREADS)"           \
                "usethreads=$(USE_5005THREADS)"         \
                "usemultiplicity=$(USE_MULTI)"          \
+               "useperlio=$(USE_PERLIO)"               \
                "LINK_FLAGS=$(LINK_FLAGS:"=\")"         \
                "optimize=$(OPTIMIZE:"=\")"
 
@@ -1026,13 +1019,20 @@ utils: $(PERLEXE) $(X2P)
        cd ..\utils
        $(MAKE) PERL=$(MINIPERL)
        cd ..\pod
+       copy ..\README.aix .\perlaix.pod
        copy ..\README.amiga .\perlamiga.pod
        copy ..\README.cygwin .\perlcygwin.pod
        copy ..\README.dos .\perldos.pod
+       copy ..\README.epoc .\perlepoc.pod
        copy ..\README.hpux .\perlhpux.pod
        copy ..\README.machten .\perlmachten.pod
        copy ..\README.os2 .\perlos2.pod
+       copy ..\README.os390 .\perlos390.pod
+       copy ..\README.vmesa .\perlvmesa.pod
+       copy ..\README.bs2000 .\perlbs2000.pod
+       copy ..\README.solaris .\perlsolaris.pod
        copy ..\vms\perlvms.pod .\perlvms.pod
+       copy ..\README.vos .\perlvos.pod
        copy ..\README.win32 .\perlwin32.pod
        $(MAKE) -f ..\win32\pod.mak converters
        cd ..\lib