summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2002-06-06 03:06:11 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2002-06-06 03:06:11 +0000
commit1a1bf20ac9578632ab875ccce847b3ecb911d83a (patch)
tree2943db63ed90d0dd1388535e5de536bf3fade932
parentade546b184e9b8b5c53dd01c94d7f06647f38259 (diff)
downloadruby-1a1bf20ac9578632ab875ccce847b3ecb911d83a.tar.gz
ruby-1a1bf20ac9578632ab875ccce847b3ecb911d83a.tar.xz
ruby-1a1bf20ac9578632ab875ccce847b3ecb911d83a.zip
* win32/Makefile.sub (config.status): use sub! instead of []= because
[]= causes exception. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@2529 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--win32/Makefile.sub2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index b055d7be2..10eaa11ce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Jun 6 12:04:30 2002 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * win32/Makefile.sub (config.status): use sub! instead of []= because
+ []= causes exception.
+
Thu Jun 6 11:42:15 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
* lib/thread.rb (Queue::pop): get rid of race condition.
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index 03422778c..c75c248ab 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -254,7 +254,7 @@ config.h: Makefile $(srcdir)/win32/Makefile.sub
config.status: Makefile $(srcdir)/win32/Makefile.sub $(MINIRUBY)
@echo Creating config.status
- @$(MINIRUBY) -pe "chomp(' ');~/@CFLAGS@/||$$_['$(CFLAGS)']='$$(CFLAGS)'" << > $@
+ @$(MINIRUBY) -pe "~/@CFLAGS@/||$$_.sub!(/#{Regexp.quote('$(CFLAGS)')}/o, '$$(CFLAGS)')" << > $@
# Generated automatically by Makefile.sub.
s,@SHELL@,$$(COMSPEC),;t t
s,@CFLAGS@,$(CFLAGS),;t t