summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-01-04 02:11:33 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-01-04 02:11:33 +0000
commit103589aa7bc7e0c714db36c897448263365993ff (patch)
tree243d6a6058c58b3fc0bbd8d8318c7d6886d9d619 /lib
parentf1eaa7583d6f7e36848a91af4801696870ba011e (diff)
downloadruby-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 'lib')
-rw-r--r--lib/mkmf.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index 5686f8137..e9d509ec3 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -1721,7 +1721,9 @@ site-install-rb: install-rb
sep = config_string('BUILD_FILE_SEPARATOR') {|s| ":/=#{s}" if s != "/"} || ""
mfile.print "$(RUBYARCHDIR)/" if $extout
- mfile.print "$(DLLIB): ", (makedef ? "$(DEFFILE) " : ""), "$(OBJS)\n"
+ mfile.print "$(DLLIB): "
+ mfile.print "$(DEFFILE) " if makedef
+ mfile.print "$(OBJS) Makefile\n"
mfile.print "\t@-$(RM) $(@#{sep})\n"
mfile.print "\t@-$(MAKEDIRS) $(@D)\n" if $extout
link_so = LINK_SO.gsub(/^/, "\t")