From 200c3aaa25c07fc40cb4bc9b38a51528e2117807 Mon Sep 17 00:00:00 2001 From: akr Date: Sun, 11 Nov 2007 10:41:35 +0000 Subject: [PATCH] * Makefile.in (lex.c): simplified. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13882 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ Makefile.in | 12 +++--------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index e150f9ee93..ceb158911e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Sun Nov 11 19:40:52 2007 Tanaka Akira + + * Makefile.in (lex.c): simplified. + Sun Nov 11 18:31:48 2007 Tanaka Akira * Makefile.in (lex.c): touch lex.c if gperf failed but lex.c exists. diff --git a/Makefile.in b/Makefile.in index c10b5ee2a9..b697cd804a 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: