summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-02-02 17:36:59 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-02-02 17:36:59 +0000
commitf41d55aec886425b3e1577b0ca31e1c7b8a6b94b (patch)
treea6dba090397bb743e9878fba3bd4d51a14c97d73
parent205f310c2963edec5fabebdce6aaae076d8af5fb (diff)
* lib/mkmf.rb (create_makefile): make object files depend on
extconf.h even if depend file exists. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11621 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--lib/mkmf.rb4
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index da43c9c43a..f9601bb955 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-Sat Feb 3 01:25:31 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Sat Feb 3 02:36:35 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* proc.c (yarv_proc_alloc): needs return.
@@ -11,6 +11,9 @@ Sat Feb 3 01:25:31 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* regenc.h: revert to before YARV.
+ * lib/mkmf.rb (create_makefile): make object files depend on
+ extconf.h even if depend file exists.
+
Fri Feb 2 23:39:42 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
* common.mk (bin): add more dependency. a patch from Tadashi
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index 4e00332096..b055c861c9 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -1335,7 +1335,7 @@ site-install-rb: install-rb
end
end
- sep = config_string('BUILD_FILE_SEPARATOR') {|sep| ":/=#{sep}" if sep != "/"} || ""
+ sep = config_string('BUILD_FILE_SEPARATOR') {|s| ":/=#{s}" if s != "/"} || ""
mfile.print "$(RUBYARCHDIR)/" if $extout
mfile.print "$(DLLIB): ", (makedef ? "$(DEFFILE) " : ""), "$(OBJS)\n"
mfile.print "\t@-$(RM) $(@#{sep})\n"
@@ -1415,9 +1415,9 @@ site-install-rb: install-rb
headers.each {|h| h.sub!(/.*/, &RULE_SUBST.method(:%))}
end
headers << $config_h if $config_h
- headers << "$(RUBY_EXTCONF_H)" if $extconf_h
mfile.print "$(OBJS): ", headers.join(' '), "\n"
end
+ mfile.print "\n$(OBJS): $(RUBY_EXTCONF_H)\n"
$makefile_created = true
ensure