archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-18 18:13:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

merges r21740 from trunk into ruby_1_9_1.

Browse source 
* lib/mkmf.rb (create_makefile): removes installed files under
  extout at distclean.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21826 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
yugui 2009-01-28 09:21:58 +00:00
parent 87eb8726e5
commit 8d88e62056
2 changed files with 13 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Thu Jan 22 18:14:04 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/mkmf.rb (create_makefile): removes installed files under
extout at distclean.
Thu Jan 22 17:12:37 2009 Takeyuki FUJIOKA <xibbar@ruby-lang.org> Thu Jan 22 17:12:37 2009 Takeyuki FUJIOKA <xibbar@ruby-lang.org>
* lib/cgi/core.rb (CGI.parse): generate only key on params hash * lib/cgi/core.rb (CGI.parse): generate only key on params hash

14
lib/mkmf.rb
View file

@ -1586,6 +1586,10 @@ def create_makefile(target, srcprefix = nil)
end end
origdef ||= '' origdef ||= ''
if $extout and $INSTALLFILES
$distcleanfiles.concat($INSTALLFILES.collect {|files, dir|File.join(dir, files.sub(/\A\.\//, ''))})
end
if $extmk and not $extconf_h if $extmk and not $extconf_h
create_header create_header
end end
@ -1660,6 +1664,8 @@ static: $(STATIC_LIB)#{$extout ? " install-rb" : ""}
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: Makefile\n") mfile.print("pre-install-rb: Makefile\n")
mfile.print("pre-install-rb-default: Makefile\n") mfile.print("pre-install-rb-default: Makefile\n")
fsep = config_string('BUILD_FILE_SEPARATOR')
sep = fsep ? ":/=#{fsep}" : ""
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
@ -1673,14 +1679,10 @@ static: $(STATIC_LIB)#{$extout ? " install-rb" : ""}
mfile.print("#{dest}: #{f}\n") mfile.print("#{dest}: #{f}\n")
mfile.print("\t$(MAKEDIRS) $(@D)\n") unless $nmake mfile.print("\t$(MAKEDIRS) $(@D)\n") unless $nmake
mfile.print("\t$(#{$extout ? 'COPY' : 'INSTALL_DATA'}) ") mfile.print("\t$(#{$extout ? 'COPY' : 'INSTALL_DATA'}) ")
sep = config_string('BUILD_FILE_SEPARATOR') if fsep
if sep f = f.gsub("/", fsep)
f = f.gsub("/", sep)
sep = ":/="+sep
f = f.gsub(/(\$\(\w+)(\))/) {$1+sep+$2} f = f.gsub(/(\$\(\w+)(\))/) {$1+sep+$2}
f = f.gsub(/(\$\{\w+)(\})/) {$1+sep+$2} f = f.gsub(/(\$\{\w+)(\})/) {$1+sep+$2}
else
sep = ""
end end
mfile.print("#{f} $(@D#{sep})\n") mfile.print("#{f} $(@D#{sep})\n")
if defined?($installed_list) and !$extout if defined?($installed_list) and !$extout