summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-24 15:01:29 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-24 15:01:29 +0000
commitb2cbe53b2b18e42490ce84db0b3ee5f9b7091c89 (patch)
tree4c80c3e4fdd8840c8a89a02a1247fc0d139a9afe
parent22da5dfe3db9f8dfb1e2db02e6684c1c3115f866 (diff)
* common.mk (revision.h): moved from Makefile.in.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@17565 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--Makefile.in9
-rw-r--r--common.mk7
3 files changed, 12 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index ef3fb919af..5c15c2acba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Jun 25 00:01:27 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * common.mk (revision.h): moved from Makefile.in.
+
Tue Jun 24 21:34:15 2008 Masaki Suketa <masaki.suketa@nifty.ne.jp>
* ext/win32ole/win32ole.c(ole_invoke): fix memory leak.
diff --git a/Makefile.in b/Makefile.in
index 044b758820..59f47af384 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -86,6 +86,7 @@ ARFLAGS = rcu
RANLIB = @RANLIB@
AS = @AS@
ASFLAGS = @ASFLAGS@
+SET_LC_MESSAGES = env LC_MESSAGES=C
OBJEXT = @OBJEXT@
MANTYPE = @MANTYPE@
@@ -200,11 +201,3 @@ update-rubyspec:
test-rubyspec:
@if [ ! -d $(srcdir)/rubyspec ]; then echo No rubyspec here. make update-rubyspec first.; exit 1; fi
$(RUNRUBY) $(srcdir)/rubyspec/mspec/bin/mspec -r$(srcdir)/ext/purelib.rb $(srcdir)/rubyspec/spec/rubyspec/$(MAJOR).$(MINOR)
-
-
-$(srcdir)/revision.h: revision.h.tmp
- @if [ -f "$@" ] && { [ ! -s $? ] || cmp "$@" $? >/dev/null; }; then \
- $(RM) $?; \
- else \
- mv -f $? "$@"; \
- fi
diff --git a/common.mk b/common.mk
index 39420cf60b..b7899e2b76 100644
--- a/common.mk
+++ b/common.mk
@@ -471,6 +471,13 @@ version.$(OBJEXT): {$(VPATH)}version.c {$(VPATH)}ruby.h config.h \
dist: $(PROGRAM)
$(RUNRUBY) $(srcdir)/distruby.rb
+{$(VPATH)}revision.h: revision.h.tmp
+ @if [ -f $(srcdir)/revision.h ] && { [ ! -s $? ] || cmp $(srcdir)/revision.h $? >/dev/null; }; then \
+ $(RM) $?; \
+ else \
+ mv -f $? $(srcdir)/revision.h; \
+ fi
+
revision.h.tmp: $(REVISION_FORCE)
@set LC_MESSAGES=C
-@$(SET_LC_MESSAGES) $(VCS) info "$(srcdir)" | \