diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-04 02:11:33 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-04 02:11:33 +0000 |
| commit | 103589aa7bc7e0c714db36c897448263365993ff (patch) | |
| tree | 243d6a6058c58b3fc0bbd8d8318c7d6886d9d619 /ext | |
| parent | f1eaa7583d6f7e36848a91af4801696870ba011e (diff) | |
| download | ruby-103589aa7bc7e0c714db36c897448263365993ff.tar.gz ruby-103589aa7bc7e0c714db36c897448263365993ff.tar.xz ruby-103589aa7bc7e0c714db36c897448263365993ff.zip | |
* ext/extmk.rb (extmake): does not use both of makefile.rb and
extconf.rb at the same time.
* lib/mkmf.rb (DLLIB): depends on Makefile. [ruby-core:21096]
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@21297 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/extmk.rb | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/ext/extmk.rb b/ext/extmk.rb index be3ad8d24..406695f9d 100644 --- a/ext/extmk.rb +++ b/ext/extmk.rb @@ -137,18 +137,17 @@ def extmake(target) begin $extconf_h = nil ok &&= extract_makefile(makefile) + conf = ["#{$srcdir}/makefile.rb", "#{$srcdir}/extconf.rb"].find {|f| File.exist?(f)} if (($extconf_h && !File.exist?($extconf_h)) || !(t = modified?(makefile, MTIMES)) || - ["#{$srcdir}/makefile.rb", "#{$srcdir}/extconf.rb", "#{$srcdir}/depend"].any? {|f| modified?(f, [t])}) + [conf, "#{$srcdir}/depend"].any? {|f| modified?(f, [t])}) then ok = false init_mkmf Logging::logfile 'mkmf.log' rm_f makefile - if File.exist?($0 = "#{$srcdir}/makefile.rb") - load $0 - elsif File.exist?($0 = "#{$srcdir}/extconf.rb") - load $0 + if conf + load $0 = conf else create_makefile(target) end |