Ensure Win32 [nd]make builds the 'static' target when ALL_STATIC=define

diff --git a/win32/Makefile b/win32/Makefile
index 4f8898a..8f72181 100644 (file)
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -553,7 +553,7 @@ CONFIGPM    = ..\lib\Config.pm ..\lib\Config_heavy.pl
 MINIMOD                = ..\lib\ExtUtils\Miniperl.pm
 X2P            = ..\x2p\a2p.exe
 GENUUDMAP      = ..\generate_uudmap.exe
-!IF "$(BUILD_STATIC)" == "define"
+!IF "$(BUILD_STATIC)" == "define" || "$(ALL_STATIC)" == "define"
 PERLSTATIC     = static
 !ELSE
 PERLSTATIC     = 

diff --git a/win32/makefile.mk b/win32/makefile.mk
index edaf6cc..001c3ad 100644 (file)
--- a/win32/makefile.mk
+++ b/win32/makefile.mk
@@ -646,7 +646,7 @@ CONFIGPM    = ..\lib\Config.pm ..\lib\Config_heavy.pl
 MINIMOD                = ..\lib\ExtUtils\Miniperl.pm
 X2P            = ..\x2p\a2p.exe
 GENUUDMAP      = ..\generate_uudmap.exe
-.IF "$(BUILD_STATIC)" == "define"
+.IF "$(BUILD_STATIC)" == "define" || "$(ALL_STATIC)" == "define"
 PERLSTATIC     = static
 .ELSE
 PERLSTATIC     =