Todo tweaks

[p5sagit/p5-mst-13.2.git] / win32 / makefile.mk

diff --git a/win32/makefile.mk b/win32/makefile.mk
index e74dc68..dab54d6 100644 (file)
--- a/win32/makefile.mk
+++ b/win32/makefile.mk
@@ -33,7 +33,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
@@ -122,7 +122,8 @@ CCTYPE              *= BORLAND
 # 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.
+# so you may have to set CCHOME explicitly (spaces in the path name should
+# not be quoted)
 #
 CCHOME         *= C:\bc5
 #CCHOME                *= $(MSVCDIR)
@@ -131,7 +132,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   *=
 
@@ -171,9 +184,6 @@ PERL_MALLOC *= undef
 USE_THREADS    *= undef
 USE_MULTI      *= undef
 
-#BUILDOPT      *= -DPERL_GLOBAL_STRUCT
-# -DUSE_PERLIO -D__STDC__=1 -DUSE_SFIO -DI_SFIO -I\sfio97\include
-
 .IMPORT .IGNORE : PROCESSOR_ARCHITECTURE
 
 PROCESSOR_ARCHITECTURE *= x86
@@ -207,7 +217,7 @@ IMPLIB              = implib -c
 # Options
 #
 RUNTIME                = -D_RTLDLL
-INCLUDES       = -I$(COREDIR) -I.\include -I. -I.. -I$(CCINCDIR)
+INCLUDES       = -I$(COREDIR) -I.\include -I. -I.. -I"$(CCINCDIR)"
 #PCHFLAGS      = -H -Hc -H=c:\temp\bcmoduls.pch 
 DEFINES                = -DWIN32 $(BUILDOPT) $(CRYPT_FLAG)
 LOCDEFS                = -DPERLDLL -DPERL_CORE
@@ -227,7 +237,7 @@ LINK_DBG    =
 
 CFLAGS         = -w -g0 -tWM -tWD $(INCLUDES) $(DEFINES) $(LOCDEFS) \
                $(PCHFLAGS) $(OPTIMIZE)
-LINK_FLAGS     = $(LINK_DBG) -L$(CCLIBDIR) $(EXTRALIBDIRS:^"-L")
+LINK_FLAGS     = $(LINK_DBG) -L"$(CCLIBDIR)"
 OBJOUT_FLAG    = -o
 EXEOUT_FLAG    = -e
 LIBOUT_FLAG    = 
@@ -265,7 +275,7 @@ LINK_DBG    =
 .ENDIF
 
 CFLAGS         = $(INCLUDES) $(DEFINES) $(LOCDEFS) $(OPTIMIZE)
-LINK_FLAGS     = $(LINK_DBG) -L$(CCLIBDIR) $(EXTRALIBDIRS:^"-L")
+LINK_FLAGS     = $(LINK_DBG) -L"$(CCLIBDIR)"
 OBJOUT_FLAG    = -o
 EXEOUT_FLAG    = -o
 LIBOUT_FLAG    = 
@@ -692,14 +702,14 @@ CFG_VARS  =                                       \
                "INST_VER=$(INST_VER)"                  \
                "archname=$(ARCHNAME)"                  \
                "cc=$(CC)"                              \
-               "ccflags=$(OPTIMIZE) $(DEFINES) $(OBJECT)"      \
+               "ccflags=$(OPTIMIZE:s/"/\"/) $(DEFINES) $(OBJECT)"      \
                "cf_email=$(EMAIL)"                     \
                "d_crypt=$(D_CRYPT)"                    \
                "d_mymalloc=$(PERL_MALLOC)"             \
                "libs=$(LIBFILES:f)"                    \
-               "incpath=$(CCINCDIR)"                   \
+               "incpath=$(CCINCDIR:s/"/\"/)"           \
                "libperl=$(PERLIMPLIB:f)"               \
-               "libpth=$(strip $(CCLIBDIR) $(EXTRALIBDIRS) $(LIBFILES:d))" \
+               "libpth=$(CCLIBDIR:s/"/\"/);$(EXTRALIBDIRS:s/"/\"/)"    \
                "libc=$(LIBC)"                          \
                "make=dmake"                            \
                "_o=$(o)" "obj_ext=$(o)"                \
@@ -709,8 +719,8 @@ CFG_VARS    =                                       \
                "nonxs_ext=$(NONXS_EXT)"                \
                "usethreads=$(USE_THREADS)"             \
                "usemultiplicity=$(USE_MULTI)"          \
-               "LINK_FLAGS=$(LINK_FLAGS)"              \
-               "optimize=$(OPTIMIZE)"
+               "LINK_FLAGS=$(LINK_FLAGS:s/"/\"/)"              \
+               "optimize=$(OPTIMIZE:s/"/\"/)"
 
 #
 # Top targets
@@ -725,9 +735,9 @@ $(DYNALOADER)$(o) : $(DYNALOADER).c $(CORE_H) $(EXTDIR)\DynaLoader\dlutils.c
 
 $(GLOBEXE) : perlglob$(o)
 .IF "$(CCTYPE)" == "BORLAND"
-       $(CC) -c -w -v -tWM -I$(CCINCDIR) perlglob.c
+       $(CC) -c -w -v -tWM -I"$(CCINCDIR)" perlglob.c
        $(LINK32) -Tpe -ap $(LINK_FLAGS) c0x32$(o) perlglob$(o) \
-           $(CCLIBDIR)\32BIT\wildargs$(o),$@,,import32.lib cw32mt.lib,
+           "$(CCLIBDIR)\32BIT\wildargs$(o)",$@,,import32.lib cw32mt.lib,
 .ELIF "$(CCTYPE)" == "GCC"
        $(LINK32) $(LINK_FLAGS) -o $@ perlglob$(o) $(LIBFILES)
 .ELSE
@@ -755,7 +765,7 @@ regen_config_h:
        -cd .. && del /f perl.exe
        cd .. && perl configpm
        -del /f $(CFGH_TMPL)
-       -mkdir ..\lib\CORE
+       -mkdir $(COREDIR)
        -perl -I..\lib config_h.PL "INST_VER=$(INST_VER)"
        rename config.h $(CFGH_TMPL)