[perl.git] branch blead, updated. v5.11.2-65-g5e86324

[Steve Hay]

In perl.git, the branch blead has been updated

<http://perl5.git.perl.org/perl.git/commitdiff/5e8632492467a144fabe819ac1f4206ecde8d14d?hp=e5973ed5ed7077edf70f4112414ae22c6300aec8>

- Log -----------------------------------------------------------------
commit 5e8632492467a144fabe819ac1f4206ecde8d14d
Author: Steve Hay <Stev...@planit.com>
Date: Tue Nov 24 10:51:54 2009 +0000

Avoid circularity in $(LINK_FLAGS) definition in Win32 dmake makefile
-----------------------------------------------------------------------

Summary of changes:
win32/makefile.mk | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/win32/makefile.mk b/win32/makefile.mk
index 43bdf85..04e0bf3 100644
--- a/win32/makefile.mk
+++ b/win32/makefile.mk
@@ -663,7 +663,7 @@ CFLAGS_O = $(CFLAGS) $(BUILDOPT)

.IF "$(CCTYPE)" == "MSVC80" || "$(CCTYPE)" == "MSVC80FREE" || \
"$(CCTYPE)" == "MSVC90" || "$(CCTYPE)" == "MSVC90FREE"
-LINK_FLAGS = $(LINK_FLAGS) "/manifestdependency:type='Win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='*' publicKeyToken='6595b64144ccf1df' language='*'"
+LINK_FLAGS += "/manifestdependency:type='Win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='*' publicKeyToken='6595b64144ccf1df' language='*'"
.ELSE
RSC_FLAGS = -DINCLUDE_MANIFEST
.ENDIF

--
Perl5 Master Repository