diff options
| author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-02-21 15:49:10 +0000 |
|---|---|---|
| committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-02-21 15:49:10 +0000 |
| commit | 2af8e54e3bd182b6611d8bb3603d76d7a5d2146b (patch) | |
| tree | bcca98afc1d34035f32e58f58c1a50ae5b89614d /lib | |
| parent | f87b1a535f69bc24d14fa14cd5ce92e497d15451 (diff) | |
merge revision(s) 21297:
* 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: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@22482 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/mkmf.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 31f4878b8b..de8dee1056 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -1333,7 +1333,9 @@ site-install-rb: install-rb end 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) $@\n" mfile.print "\t@-$(MAKEDIRS) $(@D)\n" if $extout link_so = LINK_SO.gsub(/^/, "\t") |