* ext/extmk.rb (relative_from): treat mere drive letter as an absolute

path.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8342 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2005-04-17 14:58:16 +00:00
Родитель 7906fe4b63
Коммит 3403d175d9
2 изменённых файлов: 6 добавлений и 2 удалений

Просмотреть файл

@ -1,7 +1,10 @@
Sun Apr 17 22:57:09 2005 Nobuyoshi Nakada <nobu@ruby-lang.org> Sun Apr 17 23:57:49 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/extmk.rb (extmake, parse_args): do not expand destdir. * ext/extmk.rb (extmake, parse_args): do not expand destdir.
* ext/extmk.rb (relative_from): treat mere drive letter as an absolute
path.
Sat Apr 16 17:01:16 2005 Kouhei Sutou <kou@cozmixng.org> Sat Apr 16 17:01:16 2005 Kouhei Sutou <kou@cozmixng.org>
* sample/rss/tdiary_plugin/rss-recent.rb (rss_recent_cache_rss): * sample/rss/tdiary_plugin/rss-recent.rb (rss_recent_cache_rss):

Просмотреть файл

@ -38,7 +38,8 @@ def sysquote(x)
end end
def relative_from(path, base) def relative_from(path, base)
if File.expand_path(path) == File.expand_path(path, base) dir = File.join(path, "")
if File.expand_path(dir) == File.expand_path(dir, base)
path path
else else
File.join(base, path) File.join(base, path)