aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-06-08 02:56:12 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-06-08 02:56:12 +0000
commitc571d4702ec568a16f1b3ee912a8cf996b480f8d (patch)
tree902163b7ae5eec4db3a762aedc91eebaf0a887a8
parent72734ac15451af26a7eac789cfaa3ed61bd002f8 (diff)
downloadruby-c571d4702ec568a16f1b3ee912a8cf996b480f8d.tar.gz
* lex.c.blt: moved from lex.c.
* Makefile.in: use lex.c.blt if gperf is not available. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12472 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--Makefile.in9
-rw-r--r--lex.c.blt (renamed from lex.c)0
3 files changed, 12 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 776d39b6c0..8b4baddea0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Jun 8 11:54:18 2007 Tanaka Akira <akr@fsij.org>
+
+ * lex.c.blt: moved from lex.c.
+
+ * Makefile.in: use lex.c.blt if gperf is not available.
+
Thu Jun 7 21:38:39 2007 Koichi Sasada <ko1@atdot.net>
* thread.c (rb_thread_execute_interrupts): invoke ensure when
diff --git a/Makefile.in b/Makefile.in
index 5a65d34a04..4dba2db716 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -160,9 +160,12 @@ $(srcdir)/configure: $(srcdir)/configure.in
cd $(srcdir) && $(AUTOCONF)
lex.c: keywords
- @-$(RM) $@
- gperf -C -p -j1 -i 1 -g -o -t -N rb_reserved_word -k1,3,$$ $? > $@ || \
- cp "$(srcdir)/$@" .
+ ( \
+ gperf -C -p -j1 -i 1 -g -o -t -N rb_reserved_word -k1,3,$$ $? > $@.tmp && \
+ cp $@.tmp $@ && \
+ mv $@.tmp "$(srcdir)/$@.blt" \
+ ) || \
+ cp "$(srcdir)/$@.blt" $@
.y.c:
$(YACC) $(YFLAGS) -o $@ $<
diff --git a/lex.c b/lex.c.blt
index 035873da11..035873da11 100644
--- a/lex.c
+++ b/lex.c.blt