From eb4420e670a3282a9dd52476755bdf088f1f6cb7 Mon Sep 17 00:00:00 2001 From: Steve Hay Date: Thu, 6 Jun 2013 23:05:05 +0100 Subject: [PATCH] Ensure Win32 [nd]make builds the 'static' target when ALL_STATIC=define --- win32/Makefile | 2 +- win32/makefile.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/win32/Makefile b/win32/Makefile index 4f8898a..8f721812 100644 --- 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 --- 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 = -- 2.7.4