nobu	2008-01-15 15:09:30 +0900 (Tue, 15 Jan 2008)

  New Revision: 15059

  Modified files:
    branches/ruby_1_8/ChangeLog
    branches/ruby_1_8/win32/setup.mak
    trunk/ChangeLog
    trunk/win32/setup.mak

  Log:
    * win32/setup.mak: strip out empty lines from CPP output.


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/win32/setup.mak?r1=15059&r2=15058&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/win32/setup.mak?r1=15059&r2=15058&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/ChangeLog?r1=15059&r2=15058&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=15059&r2=15058&diff_format=u

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 15058)
+++ ChangeLog	(revision 15059)
@@ -1,3 +1,7 @@
+Tue Jan 15 15:09:28 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* win32/setup.mak: strip out empty lines from CPP output.
+
 Tue Jan 15 14:57:38 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* {win,bcc}32/setup.mak (-basic-vars-): expand BASERUBY to full path
Index: win32/setup.mak
===================================================================
--- win32/setup.mak	(revision 15058)
+++ win32/setup.mak	(revision 15059)
@@ -142,7 +142,8 @@
 	@del rtname.*
 
 -version-: nul
-	@$(CPP) -I$(srcdir) <<"Creating $(MAKEFILE)" >>$(MAKEFILE)
+	@$(APPEND)
+	@$(CPP) -I$(srcdir) <<"Creating $(MAKEFILE)" | find "=" >>$(MAKEFILE)
 #define RUBY_REVISION 0
 #include "version.h"
 MAJOR = RUBY_VERSION_MAJOR
@@ -208,7 +209,8 @@
 
 -epilogue-: nul
 !if exist(confargs.c)
-	@$(CPP) confargs.c >> $(MAKEFILE)
+	@$(APPEND)
+	@$(CPP) confargs.c | find "=" >> $(MAKEFILE)
 	@del confargs.c
 !endif
 	@type << >>$(MAKEFILE)
Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 15058)
+++ ruby_1_8/ChangeLog	(revision 15059)
@@ -1,3 +1,7 @@
+Tue Jan 15 15:09:28 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* win32/setup.mak: strip out empty lines from CPP output.
+
 Tue Jan 15 03:41:42 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* eval.c (eval): check if backtrace is empty.  [ruby-core:15040]
Index: ruby_1_8/win32/setup.mak
===================================================================
--- ruby_1_8/win32/setup.mak	(revision 15058)
+++ ruby_1_8/win32/setup.mak	(revision 15059)
@@ -115,7 +115,8 @@
 	@del rtname.*
 
 -version-: nul
-	@$(CPP) -I$(srcdir) <<"Creating $(MAKEFILE)" >>$(MAKEFILE)
+	@$(APPEND)
+	@$(CPP) -I$(srcdir) <<"Creating $(MAKEFILE)" | find "=" >>$(MAKEFILE)
 #include "version.h"
 MAJOR = RUBY_VERSION_MAJOR
 MINOR = RUBY_VERSION_MINOR

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