summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-08-15 22:33:40 +0000
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-08-15 22:33:40 +0000
commit318c833055c94d4d07cc3515ab9fdb17755c5e8f (patch)
treecf2c7df612cf7a8ca84478216ef2c55a1bcbaede
parent81a183ad850b87938f40a9c73cbca47abdd08b37 (diff)
* lib/mkmf.rb (create_makefile): make OBJS depend on RUBY_EXTCONF_H
only if extconf.h is created. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_5@13032 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--lib/mkmf.rb1
-rw-r--r--version.h2
3 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 210eded923..1666cc0e3a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Aug 16 07:32:13 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * lib/mkmf.rb (create_makefile): make OBJS depend on RUBY_EXTCONF_H
+ only if extconf.h is created.
+
Thu Aug 16 07:29:33 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* {win32,wince,bcc32}/setup.mak (-version-): no RUBY_EXTERN magic.
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index d6894d532d..b1b90829f0 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -1377,6 +1377,7 @@ site-install-rb: install-rb
unless suffixes.empty?
mfile.print ".SUFFIXES: .", suffixes.uniq.join(" ."), "\n\n"
end
+ mfile.print "$(OBJS): $(RUBY_EXTCONF_H)\n\n" if $extconf_h
mfile.print depout
else
headers = %w[ruby.h defines.h]
diff --git a/version.h b/version.h
index 1e86d67a58..af412d8393 100644
--- a/version.h
+++ b/version.h
@@ -2,7 +2,7 @@
#define RUBY_RELEASE_DATE "2007-08-16"
#define RUBY_VERSION_CODE 185
#define RUBY_RELEASE_CODE 20070816
-#define RUBY_PATCHLEVEL 84
+#define RUBY_PATCHLEVEL 85
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8