summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-11-11 10:41:35 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-11-11 10:41:35 +0000
commitb4197d3e654ca0497e20418dd26e2d7ad3c90197 (patch)
tree4ece95a583d5abf918a492442376a18680362f10
parent24a1593d54c823c9e998d9afe998a14c7ea409c4 (diff)
downloadruby-b4197d3e654ca0497e20418dd26e2d7ad3c90197.tar.gz
ruby-b4197d3e654ca0497e20418dd26e2d7ad3c90197.tar.xz
ruby-b4197d3e654ca0497e20418dd26e2d7ad3c90197.zip
* Makefile.in (lex.c): simplified.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@13882 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--Makefile.in12
2 files changed, 7 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index e150f9ee9..ceb158911 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sun Nov 11 19:40:52 2007 Tanaka Akira <akr@fsij.org>
+
+ * Makefile.in (lex.c): simplified.
+
Sun Nov 11 18:31:48 2007 Tanaka Akira <akr@fsij.org>
* Makefile.in (lex.c): touch lex.c if gperf failed but lex.c exists.
diff --git a/Makefile.in b/Makefile.in
index c10b5ee2a..b697cd804 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -168,17 +168,11 @@ $(srcdir)/configure: $(srcdir)/configure.in
# * svn checkout generate a file with mtime as current time
# * XFS has a mtime with fractional part
lex.c: keywords
- if test -f $@ && test -z "`find $? -newer $@ -print`"; then \
+ ( gperf --output-file=$@.tmp -C -p -j1 -i 1 -g -o -t -N rb_reserved_word -k1,3,$$ $? && mv $@.tmp $@ ) || \
+ if test -f $@; then \
( touch $@ && echo $@ touched. ) \
- elif test -f $(srcdir)/lex.c && test -z "`find $? -newer $(srcdir)/lex.c -print`"; then \
- ( cp $(srcdir)/lex.c $@ && echo $@ copied. ) \
else \
- ( gperf --output-file=$@.tmp -C -p -j1 -i 1 -g -o -t -N rb_reserved_word -k1,3,$$ $? && cp $@.tmp $@ ) || \
- if test -f $@; then \
- ( touch $@ && echo $@ touched after gperf fail. ) \
- else \
- ( cp $(srcdir)/lex.c $@ && echo $@ copied after gperf fail. ) \
- fi \
+ ( cp $(srcdir)/lex.c $@ && echo $@ copied. ) \
fi
.y.c: