summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-10-29 16:22:25 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-10-29 16:22:25 +0000
commitc435bcba9adcd735a815ceeb85fc584b9f822eac (patch)
tree757462c2932f66a710b046de8959efbe16f12944
parent8000354991970b4a90d0baf1b4576f4d0a90472c (diff)
merged r20019 from trunk into ruby_1_9_1.
* common.mk (revision.h): have to be updated daily or by non-trivial commits. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@20040 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--common.mk2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 25deb769c3..7122708093 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -18,6 +18,11 @@ Wed Oct 29 20:45:08 2008 Yusuke Endoh <mame@tsg.ne.jp>
test/webrick/test_server.rb, test/webrick/test_filehandler.rb: use
webrick log as an assertion message.
+Wed Oct 29 14:36:50 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * common.mk (revision.h): have to be updated daily or by non-trivial
+ commits.
+
Wed Oct 29 13:18:02 2008 Akinori MUSHA <knu@iDaemons.org>
* README, README.ja: Update the portability section.
diff --git a/common.mk b/common.mk
index 39d9ce8302..ca4b6c60ae 100644
--- a/common.mk
+++ b/common.mk
@@ -671,7 +671,7 @@ prereq: incs srcs preludes
preludes: {$(VPATH)}miniprelude.c
preludes: {$(srcdir)}golf_prelude.c
-$(srcdir)/revision.h: $(REVISION_FORCE)
+$(srcdir)/revision.h: $(srcdir)/version.h $(srcdir)/ChangeLog $(REVISION_FORCE)
@set LC_MESSAGES=C
-@$(SET_LC_MESSAGES) $(VCS) info "$(@D)" | \
sed -n "s/.*Rev:/#define RUBY_REVISION/p" > "$@.tmp"