summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--eval.c1
-rw-r--r--lib/mkmf.rb6
-rw-r--r--wince/Makefile.sub2
4 files changed, 10 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 310b642..d962cec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Mar 5 12:52:08 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * lib/mkmf.rb (create_makefile): allow putting spaces between target
+ and colon in depend file.
+
Sat Mar 5 02:41:00 2005 NAKAMURA Usaku <usa@ruby-lang.org>
* file.c (eaccess): workaround for VC++8 runtime.
diff --git a/eval.c b/eval.c
index 8cbdfc3..df2487f 100644
--- a/eval.c
+++ b/eval.c
@@ -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 a6a88b9..c006612 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 c83fc85..74cb43f 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