1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* lib/mkmf.rb (create_makefile): do not create unnecessary empty

Browse Source 
directories. fixed: [ruby-dev:27451]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9419 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2005-10-19 14:58:57 +00:00
parent d32dc2b9fe
commit 23ac67ac43
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/mkmf.rb
View File

@ -1108,10 +1108,9 @@ static: $(STATIC_LIB)#{$extout ? " install-rb" : ""}
mfile.print "\t$(INSTALL_PROG) #{f} #{dir}\n" mfile.print "\t$(INSTALL_PROG) #{f} #{dir}\n"
end end
end end
dirs << (dir = "$(RUBYLIBDIR)")
mfile.print("install-rb: pre-install-rb install-rb-default\n") mfile.print("install-rb: pre-install-rb install-rb-default\n")
mfile.print("install-rb-default: pre-install-rb-default\n") mfile.print("install-rb-default: pre-install-rb-default\n")
mfile.print("pre-install-rb pre-install-rb-default: #{dir}\n") mfile.print("pre-install-rb pre-install-rb-default:\n")
for sfx, i in [["-default", [["lib/**/*.rb", "$(RUBYLIBDIR)", "lib"]]], ["", $INSTALLFILES]] for sfx, i in [["-default", [["lib/**/*.rb", "$(RUBYLIBDIR)", "lib"]]], ["", $INSTALLFILES]]
files = install_files(mfile, i, nil, srcprefix) or next files = install_files(mfile, i, nil, srcprefix) or next
for dir, *files in files for dir, *files in files
@ -1209,7 +1208,7 @@ site-install-rb: install-rb
end end
end end
if m = /\A\.(\w+)\.(\w+)(?:\s*:)/.match(line) if m = /\A\.(\w+)\.(\w+)(?:\s*:)/.match(line)
suffixes << m[1] << m[2] suffixes << m[1] << m[2]
implicit = [[m[1], m[2]], [m.post_match]] implicit = [[m[1], m[2]], [m.post_match]]
next next
elsif RULE_SUBST and /\A[$\w][^#]*:/ =~ line elsif RULE_SUBST and /\A[$\w][^#]*:/ =~ line