From 2d2cf42ed1d6fcc8a0fb62e91211a6819757d994 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 9 Mar 2009 06:19:57 +0000
Subject: * instruby.rb (manpages): use basename to compare and for Tempfile.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@22851 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog   | 4 ++++
 instruby.rb | 7 ++++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8f3b468580..7b3663eabe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Mar  9 15:19:55 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* instruby.rb (manpages): use basename to compare and for Tempfile.
+
 Mon Mar  9 14:55:27 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* instruby.rb (default gems): installs default gemspecs.
diff --git a/instruby.rb b/instruby.rb
index 4d91859fa0..fbbecbdac7 100755
--- a/instruby.rb
+++ b/instruby.rb
@@ -452,19 +452,20 @@ install?(:local, :comm, :man) do
   require File.join(srcdir, "tool/mdoc2man.rb") if $mantype != "doc"
   mdocs.each do |mdoc|
     next unless File.file?(mdoc) and open(mdoc){|fh| fh.read(1) == '.'}
-    if mdoc == "goruby.1"
+    base = File.basename(mdoc)
+    if base == "goruby.1"
       next unless has_goruby
     end
 
     destdir = mandir + (section = mdoc[/\d+$/])
-    destname = ruby_install_name.sub(/ruby/, File.basename(mdoc, ".#{section}"))
+    destname = ruby_install_name.sub(/ruby/, base.chomp(".#{section}"))
     destfile = File.join(destdir, "#{destname}.#{section}")
 
     if $mantype == "doc"
       install mdoc, destfile, :mode => $data_mode
     else
       w = nil
-      Tempfile.open(mdoc) do |f|
+      Tempfile.open(base) do |f|
         w = f
         open(mdoc) {|r| Mdoc2Man.mdoc2man(r, w)}
       end
-- 
cgit v1.2.3