diff --git a/ChangeLog b/ChangeLog index bee1ff3a7a..7f782c64fe 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,10 @@ -Sun Apr 17 22:57:09 2005 Nobuyoshi Nakada +Sun Apr 17 23:57:49 2005 Nobuyoshi Nakada * 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 * sample/rss/tdiary_plugin/rss-recent.rb (rss_recent_cache_rss): diff --git a/ext/extmk.rb b/ext/extmk.rb index 2342b0ce37..f5764168a2 100644 --- a/ext/extmk.rb +++ b/ext/extmk.rb @@ -38,7 +38,8 @@ def sysquote(x) end 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 else File.join(base, path)