Integrate from mainperl.

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

diff --git a/win32/Makefile b/win32/Makefile
index 231f6dc..3b3c4d4 100644 (file)
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -29,7 +29,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.00553
+INST_VER       = \5.00554
 
 #
 # uncomment to enable threads-capabilities
@@ -111,12 +111,8 @@ INST_VER   = \5.00553
 # set the install locations of the compiler include/libraries
 # Running VCVARS32.BAT is *required* when using Visual C.
 # Some versions of Visual C don't define MSVCDIR in the environment,
-# so you may have to set CCHOME explicitly.
-#
-# If the path contains spaces, you can try putting it in double
-# quotes, but support for this is not well-tested, and various
-# other things may break, so you're kinda on your own if you are
-# into specious paths. :-)
+# so you may have to set CCHOME explicitly (spaces in the path name should
+# not be quoted)
 #
 #CCHOME                = f:\msvc20
 CCHOME         = $(MSVCDIR)
@@ -124,7 +120,19 @@ CCINCDIR   = $(CCHOME)\include
 CCLIBDIR       = $(CCHOME)\lib
 
 #
-# specify space-separated list of extra directories to look for libraries
+# additional compiler flags can be specified here.
+#
+# Adding -DPERL_POLLUTE enables support for old symbols, at the expense of
+# extreme pollution. You most probably want this if you're compiling modules
+# from CPAN, or other such serious uses of this experimental perl release.
+# We don't enable this by default because we want the modules to get fixed
+# instead of clinging to shortcuts like this one.
+#
+#BUILDOPT      = -DPERL_POLLUTE
+
+#
+# specify semicolon-separated list of extra directories that modules will
+# look for libraries (spaces in path names need not be quoted)
 #
 EXTRALIBDIRS   =
 
@@ -165,9 +173,6 @@ USE_THREADS = undef
 USE_MULTI      = undef
 !ENDIF
 
-#BUILDOPT      = -DPERL_GLOBAL_STRUCT
-# -DUSE_PERLIO -D__STDC__=1 -DUSE_SFIO -DI_SFIO -I\sfio97\include
-
 !IF "$(PROCESSOR_ARCHITECTURE)" == ""
 PROCESSOR_ARCHITECTURE = x86
 !ENDIF
@@ -582,14 +587,14 @@ CFG_VARS  =                                       \
                "INST_VER=$(INST_VER)"                  \
                "archname=$(ARCHNAME)"                  \
                "cc=$(CC)"                              \
-               "ccflags=$(OPTIMIZE) $(DEFINES) $(OBJECT)"      \
+               "ccflags=$(OPTIMIZE:"=\") $(DEFINES) $(OBJECT)" \
                "cf_email=$(EMAIL)"                     \
                "d_crypt=$(D_CRYPT)"                    \
                "d_mymalloc=$(PERL_MALLOC)"             \
                "libs=$(LIBFILES)"                      \
-               "incpath=$(CCINCDIR)"                   \
-               "libperl=$(PERLIMPLIB:..\=)"                    \
-               "libpth=$(CCLIBDIR) $(EXTRALIBDIRS)"    \
+               "incpath=$(CCINCDIR:"=\")"              \
+               "libperl=$(PERLIMPLIB:..\=)"            \
+               "libpth=$(CCLIBDIR:"=\");$(EXTRALIBDIRS:"=\")"  \
                "libc=$(LIBC)"                          \
                "make=nmake"                            \
                "static_ext=$(STATIC_EXT)"              \
@@ -597,8 +602,8 @@ CFG_VARS    =                                       \
                "nonxs_ext=$(NONXS_EXT)"                \
                "usethreads=$(USE_THREADS)"             \
                "usemultiplicity=$(USE_MULTI)"          \
-               "LINK_FLAGS=$(LINK_FLAGS)"              \
-               "optimize=$(OPTIMIZE)"
+               "LINK_FLAGS=$(LINK_FLAGS:"=\")"         \
+               "optimize=$(OPTIMIZE:"=\")"
 
 #
 # Top targets
@@ -637,7 +642,7 @@ regen_config_h:
        perl configpm
        cd win32
        -del /f $(CFGH_TMPL)
-       -mkdir ..\lib\CORE
+       -mkdir $(COREDIR)
        -perl -I..\lib config_h.PL "INST_VER=$(INST_VER)"
        rename config.h $(CFGH_TMPL)
 
@@ -649,7 +654,7 @@ $(CONFIGPM) : $(MINIPERL) ..\config.sh config_h.PL ..\minimod.pl
        $(XCOPY) ..\ext\re\re.pm $(LIBDIR)\*.*
        $(RCOPY) include $(COREDIR)\*.*
        $(MINIPERL) -I..\lib config_h.PL "INST_VER=$(INST_VER)" \
-           || $(MAKE) $(MAKEFLAGS) $(CONFIGPM)
+           || $(MAKE) /$(MAKEFLAGS) $(CONFIGPM)
 
 $(MINIPERL) : $(MINIDIR) $(MINI_OBJ)
        $(LINK32) -subsystem:console -out:$@ @<<