From 816f0b103f52009bc1f6fbbdacab1b09c36a7703 Mon Sep 17 00:00:00 2001
From: naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 29 Jan 2008 07:27:09 +0000
Subject: * common.mk, ext/extmkf.rb: always make encdb.h.

git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@15310 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog    |  4 ++++
 common.mk    | 10 +++++++---
 ext/extmk.rb |  1 +
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d2a5cb140..a4ebf3902 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Jan 29 16:25:26 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* common.mk, ext/extmkf.rb: always make encdb.h.
+
 Tue Jan 29 12:53:39 2008  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* enc/gbk.c: add GBK, CP936 and CP949.
diff --git a/common.mk b/common.mk
index 764a3bbed..7bf6c162a 100644
--- a/common.mk
+++ b/common.mk
@@ -700,14 +700,18 @@ vm.inc: $(srcdir)/template/vm.inc.tmpl
 
 srcs: {$(VPATH)}parse.c {$(VPATH)}lex.c $(srcdir)/ext/ripper/ripper.c
 
-incs: $(INSNS) {$(VPATH)}node_name.inc {$(VPATH)}encdb.h $(srcdir)/revision.h
+incs: $(INSNS) {$(VPATH)}node_name.inc $(srcdir)/revision.h
 
 node_name.inc: {$(VPATH)}node.h
 	$(BASERUBY) -n $(srcdir)/tool/node_name.rb $? > $@
 
-encdb.h: $(srcdir)/enc/make_encdb.rb
+encdb.h.new::
 	$(BASERUBY) $(srcdir)/enc/make_encdb.rb $(srcdir)/enc $@
 
+encdb.h: encdb.h.new
+	$(IFCHANGE) "$@" "$@.new"
+	-@$(RM) "$@.new"
+
 miniprelude.c: $(srcdir)/tool/compile_prelude.rb $(srcdir)/prelude.rb
 	$(BASERUBY) -I$(srcdir) $(srcdir)/tool/compile_prelude.rb $(srcdir)/prelude.rb $@
 
@@ -798,7 +802,7 @@ up:
 	@$(VCS) up "$(srcdir)"
 	-@$(MAKE) $(MFLAGS) REVISION_FORCE=PHONY "$(srcdir)/revision.h"
 
-help:
+help: PHONY
 	@echo "                Makefile of Ruby"
 	@echo ""
 	@echo "targets:"
diff --git a/ext/extmk.rb b/ext/extmk.rb
index 8eca69f2f..a91e3e110 100644
--- a/ext/extmk.rb
+++ b/ext/extmk.rb
@@ -550,6 +550,7 @@ if $nmake == ?b
   end
 end
 $mflags.unshift("topdir=#$topdir")
+ENV["RUBYOPT"] = ''
 system($make, *sysquote($mflags)) or exit($?.exitstatus)
 
 #Local variables:
-- 
cgit