From 0ef92798abfb49a433db0e73ac2b9a7b9a62c82c Mon Sep 17 00:00:00 2001 From: shyouhei Date: Mon, 21 Dec 2009 07:17:03 +0000 Subject: merge revision(s) 25181:25183: * win32/Makefile.sub (LD_SHARED1): typo. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@26141 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- win32/Makefile.sub | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'win32') diff --git a/win32/Makefile.sub b/win32/Makefile.sub index c2e09abd42..40ae378912 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -174,8 +174,8 @@ XCFLAGS = -DRUBY_EXPORT -I. -I$(srcdir) -I$(srcdir)/missing $(XCFLAGS) # Prevents VC++ 2005 (cl ver 14) warnings CRTDEFFLAGS = -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE MANIFESTTOOL = mt -nologo -LDSHARED_1 = $(MANIFESTTOOL) -manifest $(@).manifest -outputresource:$(@);2 -LDSHARED_2 = @$(RM) $(@:/=\).manifest +LDSHARED_1 = @if exist $(@).manifest $(MANIFESTTOOL) -manifest $(@).manifest -outputresource:$(@);2 +LDSHARED_2 = @if exist $(@).manifest $(RM) $(@:/=\).manifest !endif CPPFLAGS = $(CRTDEFFLAGS) $(DEFS) $(ARCHDEFS) $(CPPFLAGS) -- cgit v1.2.3