summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--common.mk2
-rwxr-xr-xtool/rbinstall.rb (renamed from tool/instruby.rb)2
3 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index fd3d8826e1f..e5a535670bb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,7 @@
-Tue Jun 30 16:55:32 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Tue Jun 30 16:57:07 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * tool/rbinstall.rb: renamed to get rid of collision agains
+ instruction.rb on command line completion of shell.
* tool/mkconfig.rb (RbConfig.expand): get rid of exceptions on
frozen strings unless really changed.
diff --git a/common.mk b/common.mk
index 7daffca5daa..9da31daa6ed 100644
--- a/common.mk
+++ b/common.mk
@@ -103,7 +103,7 @@ SCRIPT_ARGS = --dest-dir="$(DESTDIR)" \
--make-flags="$(MAKEFLAGS)"
EXTMK_ARGS = $(SCRIPT_ARGS) --extension $(EXTS) --extstatic $(EXTSTATIC) \
--make-flags="MINIRUBY='$(MINIRUBY)'" --
-INSTRUBY = $(MINIRUBY) $(srcdir)/tool/instruby.rb
+INSTRUBY = $(MINIRUBY) $(srcdir)/tool/rbinstall.rb
INSTRUBY_ARGS = $(SCRIPT_ARGS) \
--data-mode=$(INSTALL_DATA_MODE) \
--prog-mode=$(INSTALL_PROG_MODE) \
diff --git a/tool/instruby.rb b/tool/rbinstall.rb
index 2ad8acf2c2e..621fffc70d8 100755
--- a/tool/instruby.rb
+++ b/tool/rbinstall.rb
@@ -221,7 +221,7 @@ def install_recursive(srcdir, dest, options = {})
Dir.foreach(file) do |f|
src = File.join(file, f)
d = File.join(dest, dir = src[subpath])
- stat = File.lstat(src) rescue next
+ stat = File.stat(src) rescue next
if stat.directory?
files << [src, d, true] if /\A\./ !~ f and !prune[dir]
else