From 963c43a1982ae2a6a19016d78e2c46789929415e Mon Sep 17 00:00:00 2001 From: "Janet B. Anderson" Date: Thu, 3 Jul 2008 15:16:04 +0000 Subject: [PATCH] Use $(TOOLS)/useManifestTool.pl tool only when needed and when it exists. --- configure/os/CONFIG.win32-x86.win32-x86 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configure/os/CONFIG.win32-x86.win32-x86 b/configure/os/CONFIG.win32-x86.win32-x86 index e79986483..bc1cfaef2 100644 --- a/configure/os/CONFIG.win32-x86.win32-x86 +++ b/configure/os/CONFIG.win32-x86.win32-x86 @@ -298,10 +298,10 @@ LINK.cpp = $(WINLINK) -nologo $(STATIC_LDFLAGS) $(LDFLAGS) $(PROD_LDFLAGS) -out: # linker created .manifest file into a library or product target. # useManifestTool.pl returns 0(don't use) or 1(use). # -ifeq ($(shell $(PERL) $(TOOLS)/useManifestTool.pl),1) -MT_DLL_COMMAND = mt.exe /manifest $@.manifest "/outputresource:$@;\#2" +MT_DLL_COMMAND1 = mt.exe /manifest $@.manifest "/outputresource:$@;\#2" MT_EXE_COMMAND_YES = MT_EXE_COMMAND_NO = mt.exe /manifest $@.manifest "/outputresource:$@;\#1" -MT_EXE_COMMAND = $(MT_EXE_COMMAND_$(STATIC_BUILD)) -endif +MT_EXE_COMMAND1 = $(MT_EXE_COMMAND_$(STATIC_BUILD)) +MT_DLL_COMMAND = $(MT_DLL_COMMAND$(shell $(PERL) $(TOOLS)/useManifestTool.pl)) +MT_EXE_COMMAND = $(MT_EXE_COMMAND$(shell $(PERL) $(TOOLS)/useManifestTool.pl))