Update to MakeMaker 6.30

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

diff --git a/win32/Makefile b/win32/Makefile
index d63d602..6b12a9d 100644 (file)
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -32,7 +32,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.9.2
+#INST_VER      = \5.9.3
 
 #
 # Comment this out if you DON'T want your perl installation to have
@@ -46,6 +46,14 @@ INST_TOP     = $(INST_DRV)\perl
 #INST_ARCH     = \$(ARCHNAME)
 
 #
+# Uncomment this if you want perl to run
+#      $Config{sitelibexp}\sitecustomize.pl
+# before anything else.  This script can then be set up, for example,
+# to add additional entries to @INC.
+#
+#USE_SITECUST  = define
+
+#
 # uncomment to enable multiple interpreters.  This is need for fork()
 # emulation and for thread support.
 #
@@ -160,6 +168,7 @@ CCLIBDIR    = $(CCHOME)\lib
 # Additional compiler flags can be specified here.
 #
 
+#
 # Adding -DPERL_HASH_SEED_EXPLICIT will disable randomization of Perl's
 # internal hash function unless the PERL_HASH_SEED environment variable is set.
 # Alternatively, adding -DNO_HASH_SEED will completely disable the
@@ -234,6 +243,10 @@ DEBUG_MSTATS       = undef
 BUILDOPT       = $(BUILDOPT) -DPERL_DEBUGGING_MSTATS
 !ENDIF
 
+!IF "$(USE_SITECUST)" == ""
+USE_SITECUST   = undef
+!ENDIF
+
 !IF "$(USE_MULTI)" == ""
 USE_MULTI      = undef
 !ENDIF
@@ -266,6 +279,10 @@ USE_MULTI  = define
 USE_MULTI      = define
 !ENDIF
 
+!IF "$(USE_SITECUST)" == "define"
+BUILDOPT       = $(BUILDOPT) -DUSE_SITECUSTOMIZE
+!ENDIF
+
 !IF "$(USE_MULTI)" != "undef"
 BUILDOPT       = $(BUILDOPT) -DPERL_IMPLICIT_CONTEXT
 !ENDIF
@@ -709,6 +726,7 @@ PERLIOVIA           = $(EXTDIR)\PerlIO\via\via
 XSAPITEST              = $(EXTDIR)\XS\APItest\APItest
 XSTYPEMAP              = $(EXTDIR)\XS\Typemap\Typemap
 UNICODENORMALIZE       = $(EXTDIR)\Unicode\Normalize\Normalize
+MATHBIGINTFASTCALC     = $(EXTDIR)\Math\BigInt\FastCalc\FastCalc
 WIN32_DIR              = ext\Win32
 
 SOCKET_DLL             = $(AUTODIR)\Socket\Socket.dll
@@ -740,6 +758,7 @@ PERLIOVIA_DLL               = $(AUTODIR)\PerlIO\via\via.dll
 XSAPITEST_DLL          = $(AUTODIR)\XS\APItest\APItest.dll
 XSTYPEMAP_DLL          = $(AUTODIR)\XS\Typemap\Typemap.dll
 UNICODENORMALIZE_DLL   = $(AUTODIR)\Unicode\Normalize\Normalize.dll
+MATHBIGINTFASTCALC_DLL = $(AUTODIR)\Math\BigInt\FastCalc\FastCalc.dll
 WIN32_DLL              = $(AUTODIR)\Win32\Win32.dll
 
 EXTENSION_C    =               \
@@ -772,6 +791,7 @@ EXTENSION_C =               \
                $(XSAPITEST).c  \
                $(XSTYPEMAP).c  \
                $(UNICODENORMALIZE).c   \
+               $(MATHBIGINTFASTCALC).c \
                $(WIN32_DIR).c
 
 EXTENSION_DLL  =               \
@@ -804,6 +824,7 @@ EXTENSION_DLL       =               \
                $(XSAPITEST_DLL)        \
                $(XSTYPEMAP_DLL)        \
                $(UNICODENORMALIZE_DLL) \
+               $(MATHBIGINTFASTCALC_DLL)       \
                $(WIN32_DLL)
 
 POD2HTML       = $(PODDIR)\pod2html
@@ -835,6 +856,7 @@ CFG_VARS    =                                       \
                "usemultiplicity=$(USE_MULTI)"          \
                "useperlio=$(USE_PERLIO)"               \
                "uselargefiles=$(USE_LARGE_FILES)"      \
+               "usesitecustomize=$(USE_SITECUST)"      \
                "LINK_FLAGS=$(LINK_FLAGS:"=\")"         \
                "optimize=$(OPTIMIZE:"=\")"
 
@@ -993,25 +1015,20 @@ $(DYNALOADER).c: $(MINIPERL) $(EXTDIR)\DynaLoader\dl_win32.xs $(CONFIGPM)
 $(EXTDIR)\DynaLoader\dl_win32.xs: dl_win32.xs
        copy dl_win32.xs $(EXTDIR)\DynaLoader\dl_win32.xs
 
-#----------------------------------------------------------------------------------
+#-------------------------------------------------------------------------------
 Extensions: buildext.pl $(PERLDEP) $(CONFIGPM)
        $(MINIPERL) -I..\lib buildext.pl $(MAKE) $(PERLDEP) $(EXTDIR)
        $(MINIPERL) -I..\lib buildext.pl $(MAKE) $(PERLDEP) ext
 
-# Note: The next two targets explicitly remove a "blibdirs.exists" file that
-# currerntly gets left behind, until CPAN RT Ticket #5616 is resolved.
-
 Extensions_clean: 
        -if exist $(MINIPERL) $(MINIPERL) -I..\lib buildext.pl $(MAKE) $(PERLDEP) $(EXTDIR) clean
        -if exist $(MINIPERL) $(MINIPERL) -I..\lib buildext.pl $(MAKE) $(PERLDEP) ext clean
-       -if exist $(EXTDIR)\SDBM_File\sdbm\blibdirs.exists del /f $(EXTDIR)\SDBM_File\sdbm\blibdirs.exists
 
 Extensions_realclean: 
        -if exist $(MINIPERL) $(MINIPERL) -I..\lib buildext.pl $(MAKE) $(PERLDEP) $(EXTDIR) realclean
        -if exist $(MINIPERL) $(MINIPERL) -I..\lib buildext.pl $(MAKE) $(PERLDEP) ext realclean
-       -if exist $(EXTDIR)\SDBM_File\sdbm\blibdirs.exists del /f $(EXTDIR)\SDBM_File\sdbm\blibdirs.exists
 
-#----------------------------------------------------------------------------------
+#-------------------------------------------------------------------------------
 
 doc: $(PERLEXE)
        $(PERLEXE) -I..\lib ..\installhtml --podroot=.. --htmldir=./html \
@@ -1055,6 +1072,7 @@ utils: $(PERLEXE) $(X2P)
        copy ..\README.plan9    ..\pod\perlplan9.pod
        copy ..\README.qnx      ..\pod\perlqnx.pod
        copy ..\README.solaris  ..\pod\perlsolaris.pod
+       copy ..\README.symbian  ..\pod\perlsymbian.pod
        copy ..\README.tru64    ..\pod\perltru64.pod
        copy ..\README.tw       ..\pod\perltw.pod
        copy ..\README.uts      ..\pod\perluts.pod
@@ -1062,7 +1080,7 @@ utils: $(PERLEXE) $(X2P)
        copy ..\README.vms      ..\pod\perlvms.pod
        copy ..\README.vos      ..\pod\perlvos.pod
        copy ..\README.win32    ..\pod\perlwin32.pod
-       copy ..\pod\perl592delta.pod ..\pod\perldelta.pod
+       copy ..\pod\perl593delta.pod ..\pod\perldelta.pod
        $(MAKE) -f ..\win32\pod.mak converters
        cd ..\lib
        $(PERLEXE) lib_pm.PL
@@ -1105,6 +1123,7 @@ distclean: realclean
        -del /f $(LIBDIR)\threads\shared.pm
        -del /f $(LIBDIR)\Time\HiRes.pm
        -del /f $(LIBDIR)\Unicode\Normalize.pm
+       -del /f $(LIBDIR)\Math\BigInt\FastCalc.pm
        -del /f $(LIBDIR)\Win32.pm
        -if exist $(LIBDIR)\IO rmdir /s /q $(LIBDIR)\IO
        -if exist $(LIBDIR)\IO rmdir /s $(LIBDIR)\IO
@@ -1136,9 +1155,9 @@ distclean: realclean
            perljp.pod perlko.pod perlmachten.pod perlmacos.pod \
            perlmacosx.pod perlmint.pod perlmpeix.pod perlnetware.pod \
            perlos2.pod perlos390.pod perlos400.pod perlplan9.pod \
-           perlqnx.pod perlsolaris.pod perltru64.pod perltw.pod \
-           perluts.pod perlvmesa.pod perlvms.pod perlvms.pod perlvos.pod \
-           perlwin32.pod \
+           perlqnx.pod perlsolaris.pod perlsymbian.pod perltru64.pod \
+           perltw.pod perluts.pod perlvmesa.pod perlvms.pod perlvms.pod \
+           perlvos.pod perlwin32.pod \
            pod2html pod2latex pod2man pod2text pod2usage \
            podchecker podselect
        -cd ..\utils && del /f h2ph splain perlbug pl2pm c2ph pstruct h2xs \