diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-28 09:21:58 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-28 09:21:58 +0000 |
| commit | 8d88e620563221271ae100707d6f164633526f1e (patch) | |
| tree | fb19ceaee5afbb867c411248b4b108ed612909e6 | |
| parent | 87eb8726e51c2c2d71553209c0e60891b7168089 (diff) | |
merges r21740 from trunk into ruby_1_9_1.
* 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
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/mkmf.rb | 14 |
2 files changed, 13 insertions, 6 deletions
@@ -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> * lib/cgi/core.rb (CGI.parse): generate only key on params hash diff --git a/lib/mkmf.rb b/lib/mkmf.rb index e9d509ec39..401b569f7d 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -1586,6 +1586,10 @@ def create_makefile(target, srcprefix = nil) end origdef ||= '' + if $extout and $INSTALLFILES + $distcleanfiles.concat($INSTALLFILES.collect {|files, dir|File.join(dir, files.sub(/\A\.\//, ''))}) + end + if $extmk and not $extconf_h create_header end @@ -1660,6 +1664,8 @@ static: $(STATIC_LIB)#{$extout ? " install-rb" : ""} mfile.print("install-rb-default: pre-install-rb-default\n") mfile.print("pre-install-rb: 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]] files = install_files(mfile, i, nil, srcprefix) or next for dir, *files in files @@ -1673,14 +1679,10 @@ static: $(STATIC_LIB)#{$extout ? " install-rb" : ""} mfile.print("#{dest}: #{f}\n") mfile.print("\t$(MAKEDIRS) $(@D)\n") unless $nmake mfile.print("\t$(#{$extout ? 'COPY' : 'INSTALL_DATA'}) ") - sep = config_string('BUILD_FILE_SEPARATOR') - if sep - f = f.gsub("/", sep) - sep = ":/="+sep + if fsep + f = f.gsub("/", fsep) f = f.gsub(/(\$\(\w+)(\))/) {$1+sep+$2} f = f.gsub(/(\$\{\w+)(\})/) {$1+sep+$2} - else - sep = "" end mfile.print("#{f} $(@D#{sep})\n") if defined?($installed_list) and !$extout |