shyouhei	2010-06-08 18:59:39 +0900 (Tue, 08 Jun 2010)

  New Revision: 28228

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=28228

  Log:
    * win32/Makefile.sub (config.status): no need to embbed manifest if not exist.

  Modified files:
    branches/ruby_1_8_7/ChangeLog
    branches/ruby_1_8_7/version.h
    branches/ruby_1_8_7/win32/Makefile.sub

Index: ruby_1_8_7/ChangeLog
===================================================================
--- ruby_1_8_7/ChangeLog	(revision 28227)
+++ ruby_1_8_7/ChangeLog	(revision 28228)
@@ -1,3 +1,7 @@
+Tue Jun  8 18:57:48 2010  NAKAMURA Usaku  <usa@r...>
+
+	* win32/Makefile.sub (config.status): no need to embbed manifest if not exist.
+
 Tue Jun  8 18:38:36 2010  NAKAMURA Usaku  <usa@r...>
 
 	* include/ruby/win32.h: include errno.h before defining errnos.
Index: ruby_1_8_7/version.h
===================================================================
--- ruby_1_8_7/version.h	(revision 28227)
+++ ruby_1_8_7/version.h	(revision 28228)
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2010-06-08"
 #define RUBY_VERSION_CODE 187
 #define RUBY_RELEASE_CODE 20100608
-#define RUBY_PATCHLEVEL 290
+#define RUBY_PATCHLEVEL 291
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
Index: ruby_1_8_7/win32/Makefile.sub
===================================================================
--- ruby_1_8_7/win32/Makefile.sub	(revision 28227)
+++ ruby_1_8_7/win32/Makefile.sub	(revision 28228)
@@ -537,8 +537,8 @@
 s,@LIBARG@,%s.lib,;t t
 s,@LINK_SO@,$$(LDSHARED) -Fe$$(@) $$(OBJS) $$(LIBS) $$(LOCAL_LIBS) $$(DLDFLAGS) -implib:$$(*F:.so=)-$$(arch).lib -pdb:$$(*F:.so=)-$$(arch).pdb -def:$$(DEFFILE),;t t
 !if $(MSC_VER) >= 1400
-s,@LINK_SO@,$(MANIFESTTOOL) -manifest $$(@).manifest -outputresource:$$(@);2,;t t
-s,@LINK_SO@,@$$(RM) $$(@:/=\).manifest,;t t
+s,@LINK_SO@,@if exist $$(@).manifest $(MANIFESTTOOL) -manifest $$(@).manifest -outputresource:$$(@);2,;t t
+s,@LINK_SO@,@if exist $$(@).manifest $$(RM) $$(@:/=\).manifest,;t t
 !endif
 s,@COMPILE_C@,$$(CC) $$(INCFLAGS) $$(CFLAGS) $$(CPPFLAGS) -c -Tc$$(<:\=/),;t t
 s,@COMPILE_CXX@,$$(CXX) $$(INCFLAGS) $$(CXXFLAGS) $$(CPPFLAGS) -c -Tp$$(<:\=/),;t t

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/