Storable: various core fixups: $PERL,libpth,getcwd

[perl5.git] / win32 / makefile.mk

diff --git a/win32/makefile.mk b/win32/makefile.mk
index e569927..ea22cac 100644 (file)
--- a/win32/makefile.mk
+++ b/win32/makefile.mk
@@ -44,7 +44,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.27.6
+#INST_VER      *= \5.27.9
 
 #
 # Comment this out if you DON'T want your perl installation to have
@@ -452,6 +452,9 @@ ARCHNAME    !:= $(ARCHNAME)-ld
 .IF "$(GCCCROSS)" == "define"
 CCINCDIR *= $(CCHOME)\x86_64-w64-mingw32\include
 CCLIBDIR *= $(CCHOME)\x86_64-w64-mingw32\lib
+.ELIF "$(CCTYPE)" == "GCC"
+CCINCDIR *= $(CCHOME)\include
+CCLIBDIR *= $(CCHOME)\lib
 .ELSE
 CCINCDIR *= $(CCHOME)\include
 .IF "$(CCTYPE)" == "MSVC141"
@@ -461,9 +464,13 @@ CCLIBDIR *= $(CCHOME)\lib\x64
 CCLIBDIR *= $(CCHOME)\lib\x86
 .ENDIF
 .ELSE
+.IF "$(WIN64)" == "define"
+CCLIBDIR *= $(CCHOME)\lib\amd64
+.ELSE
 CCLIBDIR *= $(CCHOME)\lib
 .ENDIF
 .ENDIF
+.ENDIF
 
 # Set DLL location for GCC compilers.
 .IF "$(CCTYPE)" == "GCC"
@@ -1535,12 +1542,18 @@ Extensions_realclean :
 # be running in parallel like UNIDATAFILES, this target a placeholder for the
 # future
 .IF "$(BUILD_STATIC)"=="define"
-rebasePE : Extensions $(PERLDLL) Extensions_normalize $(PERLEXE) $(PERLEXESTATIC)
+rebasePE : Extensions $(PERLDLL) Extensions_normalize $(PERLEXE) PostExt $(PERLEXESTATIC)
 .ELSE
-rebasePE : Extensions $(PERLDLL) Extensions_normalize $(PERLEXE)
+rebasePE : Extensions $(PERLDLL) Extensions_normalize $(PERLEXE) PostExt
 .ENDIF
        $(NOOP)
 
+PostExt: rebuild_storable
+
+rebuild_storable: $(PERLEXE)
+       $(PERLEXE) -I..\lib -I. ..\dist\Storable\stacksize --core
+       cd ..\dist\Storable && $(MAKE) PERL_CORE=1
+
 #-------------------------------------------------------------------------------
 
 
@@ -1589,7 +1602,7 @@ utils: $(HAVEMINIPERL) ..\utils\Makefile
        copy ..\README.tw       ..\pod\perltw.pod
        copy ..\README.vos      ..\pod\perlvos.pod
        copy ..\README.win32    ..\pod\perlwin32.pod
-       copy ..\pod\perldelta.pod ..\pod\perl5277delta.pod
+       copy ..\pod\perldelta.pod ..\pod\perl5279delta.pod
        $(MINIPERL) -I..\lib $(PL2BAT) $(UTILS)
        $(MINIPERL) -I..\lib ..\autodoc.pl ..
        $(MINIPERL) -I..\lib ..\pod\perlmodlib.PL -q ..
@@ -1687,7 +1700,7 @@ distclean: realclean
        -if exist $(LIBDIR)\Win32API rmdir /s /q $(LIBDIR)\Win32API
        -if exist $(LIBDIR)\XS rmdir /s /q $(LIBDIR)\XS
        -cd $(PODDIR) && del /f *.html *.bat roffitall \
-           perl5277delta.pod perlaix.pod perlamiga.pod perlandroid.pod \
+           perl5279delta.pod perlaix.pod perlamiga.pod perlandroid.pod \
            perlapi.pod perlbs2000.pod perlce.pod perlcn.pod perlcygwin.pod \
            perldos.pod perlfreebsd.pod perlhaiku.pod perlhpux.pod \
            perlhurd.pod perlintern.pod perlirix.pod perljp.pod perlko.pod \