summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--Makefile.in8
2 files changed, 7 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index fff877b596..5f372f0686 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,7 @@
-Wed Dec 3 11:36:42 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Wed Dec 3 13:28:13 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * Makefile.in (lex.c): try gperf first, and copy from the source
+ directory if failed. [ruby-dev:22123]
* ext/extmk.rb (MTIMES): let makefiles depend to mkmf.rb.
diff --git a/Makefile.in b/Makefile.in
index 1accc04638..64110b8761 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -222,11 +222,9 @@ $(srcdir)/configure: $(srcdir)/configure.in
$(CC) $(CFLAGS) $(CPPFLAGS) -c $<
lex.c: keywords
- if test "$(srcdir)" = "."; then \
- gperf -p -j1 -i 1 -g -o -t -N rb_reserved_word -k1,3,$$ $> > $@; \
- else \
- cp $(srcdir)/lex.c .; \
- fi
+ @-rm -f $@
+ gperf -p -j1 -i 1 -g -o -t -N rb_reserved_word -k1,3,$$ $> > $@ || \
+ cp "$(srcdir)/$@" .
.y.c:
$(YACC) $<