diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-03-05 03:52:21 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-03-05 03:52:21 +0000 |
| commit | 47839448767f922a88956a7d4a30c77c36a53304 (patch) | |
| tree | 07ff79bc2fa6912085c71f2597ac53f38810bf71 | |
| parent | 1117412bccea71a2a4b2a94db2d112cac2640a01 (diff) | |
* lib/mkmf.rb (create_makefile): allow putting spaces between target
and colon in depend file.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8074 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | eval.c | 1 | ||||
| -rw-r--r-- | lib/mkmf.rb | 6 | ||||
| -rw-r--r-- | wince/Makefile.sub | 2 |
4 files changed, 10 insertions, 4 deletions
@@ -1,3 +1,8 @@ +Sat Mar 5 12:52:08 2005 Nobuyoshi Nakada <[email protected]> + + * lib/mkmf.rb (create_makefile): allow putting spaces between target + and colon in depend file. + Sat Mar 5 02:41:00 2005 NAKAMURA Usaku <[email protected]> * file.c (eaccess): workaround for VC++8 runtime. @@ -4633,6 +4633,7 @@ break_jump(retval) static VALUE bmcall _((VALUE, VALUE)); static int method_arity _((VALUE)); +/*:nodoc:*/ static VALUE rb_yield_0(val, self, klass, flags, avalue) VALUE val, self, klass; /* OK */ diff --git a/lib/mkmf.rb b/lib/mkmf.rb index a6a88b99ca..c0066126ad 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -1096,11 +1096,11 @@ site-install-rb: install-rb impconv[] end end - if /\A\.(\w+)\.(\w+)(?:\s*:)/ =~ line - implicit = [[$1, $2], [$']] + if m = /\A\.(\w+)\.(\w+)(?:\s*:)/.match(line) + implicit = [[m[1], m[2]], [m.post_match]] next elsif RULE_SUBST and /\A[$\w][^#]*:/ =~ line - line.gsub!(%r"(?<=\A|\s)(?!\.)([^$(){}+=:\s\/\\,]+)(?=\s|\z)") {|*m| RULE_SUBST % m} + line.gsub!(%r"(?<=\s)(?!\.)([^$(){}+=:\s\/\\,]+)(?=\s|\z)") {|*m| RULE_SUBST % m} end mfile.print line end diff --git a/wince/Makefile.sub b/wince/Makefile.sub index c83fc85f7f..74cb43f1e1 100644 --- a/wince/Makefile.sub +++ b/wince/Makefile.sub @@ -194,7 +194,7 @@ BANG = ! !include config.h !endif -$(CONFIG_H): $(MKFILES) $(srcdir)/win32/Makefile.sub +$(CONFIG_H): $(MKFILES) $(srcdir)/wince/Makefile.sub @echo Creating config.h @$(srcdir:/=\)\win32\ifchange.bat config.h << #define STDC_HEADERS 1 |