diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-04-17 14:58:16 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-04-17 14:58:16 +0000 |
| commit | 905bbc2752407f972739816cf307ea3841d2e1d1 (patch) | |
| tree | 574920c5883f09efd7e944763355a8f99d0e8a13 | |
| parent | c08e6b2780af9bd45e9e83261f466fbc23912621 (diff) | |
| download | ruby-905bbc2752407f972739816cf307ea3841d2e1d1.tar.gz ruby-905bbc2752407f972739816cf307ea3841d2e1d1.tar.xz ruby-905bbc2752407f972739816cf307ea3841d2e1d1.zip | |
* ext/extmk.rb (relative_from): treat mere drive letter as an absolute
path.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@8342 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ext/extmk.rb | 3 |
2 files changed, 6 insertions, 2 deletions
@@ -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 (relative_from): treat mere drive letter as an absolute + path. + Sat Apr 16 17:01:16 2005 Kouhei Sutou <kou@cozmixng.org> * sample/rss/tdiary_plugin/rss-recent.rb (rss_recent_cache_rss): diff --git a/ext/extmk.rb b/ext/extmk.rb index f14475fca..4696b332a 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) |