summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoreban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2001-03-10 16:03:56 +0000
committereban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2001-03-10 16:03:56 +0000
commit03b3ac0d2a32f29ae6c2040902e11bd9f3fd1597 (patch)
tree20f4045080b69b064095dd2f210d9e6762ec770d
parent865dc070b2f391d1ff6aad44d17f3558724c2ca1 (diff)
downloadruby-03b3ac0d2a32f29ae6c2040902e11bd9f3fd1597.tar.gz
ruby-03b3ac0d2a32f29ae6c2040902e11bd9f3fd1597.tar.xz
ruby-03b3ac0d2a32f29ae6c2040902e11bd9f3fd1597.zip
* lib/mkmf.rb (install_rb): fix handling of destination path.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@1239 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--lib/mkmf.rb4
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 19eda683c..a949a7025 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sun Mar 11 00:55:31 2001 WATANABE Hirofumi <eban@ruby-lang.org>
+
+ * lib/mkmf.rb (install_rb): fix handling of destination path.
+
Sat Mar 10 02:34:18 2001 WATANABE Hirofumi <eban@ruby-lang.org>
* math.c (math_log, math_log10): use nan() instead of 0.0/0.0 on Cygwin.
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index 4eb77a9b1..f3438fbac 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -155,7 +155,9 @@ def install_rb(mfile, dest, srcdir = nil)
mfile.printf "\t@$(RUBY) -r ftools -e 'File::makedirs(*ARGV)' %s/%s\n", dest, f
end
for f in path
- mfile.printf "\t@$(RUBY) -r ftools -e 'File::install(ARGV[0], ARGV[1], 0644, true)' %s/%s %s\n", libdir, f, dest
+ d = '/' + File::dirname(f)
+ d = '' if d == '/.'
+ mfile.printf "\t@$(RUBY) -r ftools -e 'File::install(ARGV[0], ARGV[1], 0644, true)' %s/%s %s%s\n", libdir, f, dest, d
end
end