yugui	2009-05-12 00:06:41 +0900 (Tue, 12 May 2009)

  New Revision: 23402

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

  Log:
    merges r22441 from trunk into ruby_1_9_1.
    --
    * template/fake.rb.in: extracted from Makefile.in.
    * configure.in (fake.rb): prefixed with $(arch)-.

  Added files:
    branches/ruby_1_9_1/template/fake.rb.in
  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/Makefile.in
    branches/ruby_1_9_1/configure.in

Index: ruby_1_9_1/configure.in
===================================================================
--- ruby_1_9_1/configure.in	(revision 23401)
+++ ruby_1_9_1/configure.in	(revision 23402)
@@ -1670,7 +1670,7 @@
 
 if test x"$cross_compiling" = xyes; then
   test x"$MINIRUBY" = x && MINIRUBY="${RUBY-ruby} -I`pwd` -rfake"
-  PREP=fake.rb
+  PREP='$(arch)-fake.rb'
   RUNRUBY='$(MINIRUBY) -I`cd $(srcdir)/lib; pwd`'
 else
   MINIRUBY='./miniruby$(EXEEXT) -I$(srcdir)/lib'
Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 23401)
+++ ruby_1_9_1/ChangeLog	(revision 23402)
@@ -1,3 +1,9 @@
+Thu Feb 19 15:47:11 2009  Nobuyoshi Nakada  <nobu@r...>
+
+	* template/fake.rb.in: extracted from Makefile.in.
+
+	* configure.in (fake.rb): prefixed with $(arch)-.
+
 Sun Apr 26 20:21:39 2009  NARUSE, Yui  <naruse@r...>
 
 	* .gitignore: added.
Index: ruby_1_9_1/Makefile.in
===================================================================
--- ruby_1_9_1/Makefile.in	(revision 23401)
+++ ruby_1_9_1/Makefile.in	(revision 23402)
@@ -28,6 +28,7 @@
 arch = @arch@
 sitearch = @sitearch@
 sitedir = @sitedir@
+ruby_version = @ruby_version@
 
 TESTUI = console
 TESTS =
@@ -152,22 +153,9 @@
 						  File.symlink "$(LIBRUBY_SO)", link}' \
 				$(LIBRUBY_ALIASES) || true
 
-fake.rb:	Makefile
-		@echo ' \
-		class Object; \
-		  CROSS_COMPILING = RUBY_PLATFORM; \
-		  remove_const :RUBY_PLATFORM; \
-		  remove_const :RUBY_VERSION; \
-		  RUBY_PLATFORM = "@arch@"; \
-		  RUBY_VERSION = "@MAJOR@.@MINOR@.@TEENY@"; \
-		end; \
-		if RUBY_PLATFORM =~ /mswin|bccwin|mingw/; \
-		  class File; \
-		    remove_const :ALT_SEPARATOR; \
-		    ALT_SEPARATOR = "\\"; \
-		  end; \
-		end; \
-		' > $@
+fake: $(arch)-fake.rb
+$(arch)-fake.rb: config.status
+		 @./config.status --file=$@:$(srcdir)/template/fake.rb.in
 
 Makefile:	$(srcdir)/Makefile.in $(srcdir)/enc/Makefile.in
 
Index: ruby_1_9_1/template/fake.rb.in
===================================================================
--- ruby_1_9_1/template/fake.rb.in	(revision 0)
+++ ruby_1_9_1/template/fake.rb.in	(revision 23402)
@@ -0,0 +1,15 @@
+class Object
+  CROSS_COMPILING = RUBY_PLATFORM
+  remove_const :RUBY_PLATFORM
+  remove_const :RUBY_VERSION
+  remove_const :RUBY_DESCRIPTION if defined?(RUBY_DESCRIPTION)
+  RUBY_PLATFORM = "@arch@"
+  RUBY_VERSION = "@MAJOR@.@MINOR@.@TEENY@"
+  RUBY_DESCRIPTION = "ruby #{RUBY_VERSION} (#{Time.now.strftime("%Y-%m-%d")}) [#{RUBY_PLATFORM}]"
+end
+if RUBY_PLATFORM =~ /mswin|bccwin|mingw/
+  class File
+    remove_const :ALT_SEPARATOR
+    ALT_SEPARATOR = "\\"
+  end
+end

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