diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-28 09:23:46 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-28 09:23:46 +0000 |
| commit | 2f59c5e0f7951086fb1ed60b002eda1b4c6a0f68 (patch) | |
| tree | abc20ed3e02fdc216ee9b8f3e21c086a211addea | |
| parent | a89d7e204f41fadd73d3b8a5bfc41231fb9324ef (diff) | |
merges r21783 from trunk into ruby_1_9_1.
* lib/mkmf.rb (create_makefile): should point correct path to
ruby.h and defines.h. [ruby-core:21570]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21838 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/mkmf.rb | 2 |
2 files changed, 6 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Tue Jan 27 03:23:43 2009 Yukihiro Matsumoto <matz@ruby-lang.org> + + * lib/mkmf.rb (create_makefile): should point correct path to + ruby.h and defines.h. [ruby-core:21570] + Mon Jan 26 16:00:40 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> * array.c (rb_ary_aset): fixed arguments evaluation order. diff --git a/lib/mkmf.rb b/lib/mkmf.rb index ec264796ae..67f9b97aa9 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -1784,7 +1784,7 @@ site-install-rb: install-rb if File.exist?(depend) mfile.print("###\n", *depend_rules(File.read(depend))) else - headers = %w[ruby.h defines.h] + headers = %w[$(hdrdir)/ruby.h $(hdrdir)/ruby/defines.h] if RULE_SUBST headers.each {|h| h.sub!(/.*/, &RULE_SUBST.method(:%))} end |