aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--change.log12
-rw-r--r--ext/ripper/depend4
3 files changed, 7 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 5df58d6f50..51c34f72ab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Dec 26 22:25:07 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * ext/ripper/depend (ripper.y): fix messages with nmake.
+ [ruby-dev:42896]
+
Sun Dec 26 22:24:14 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* file.c (file_expand_path): get rid of warnings caused by
diff --git a/change.log1 b/change.log1
deleted file mode 100644
index 05c0d752e0..0000000000
--- a/change.log1
+++ /dev/null
@@ -1,2 +0,0 @@
- * ext/ripper/depend (ripper.y): fix messages with nmake.
- [ruby-dev:42896]
diff --git a/ext/ripper/depend b/ext/ripper/depend
index 01a1cf53b8..40d54dab77 100644
--- a/ext/ripper/depend
+++ b/ext/ripper/depend
@@ -24,7 +24,7 @@ all: check
static: check
ripper.y: $(srcdir)/tools/preproc.rb $(top_srcdir)/parse.y
- $(ECHO) extracting $@ from $<
+ $(ECHO) extracting $@ from $(top_srcdir)/parse.y
$(Q) $(RUBY) $(srcdir)/tools/preproc.rb $(top_srcdir)/parse.y --output=$@
check: $(GEN) $(SRC1) $(SRC2)
@@ -43,5 +43,5 @@ eventids2table.c: $(srcdir)/tools/generate.rb $(SRC2)
preproc: ripper.E
ripper.E: ripper.c
- $(ECHO) preprocessing $<
+ $(ECHO) preprocessing ripper.c
$(Q) $(CC) -E $(CPPFLAGS) ripper.c | $(RUBY) $(srcdir)/tools/strip.rb > $@