3 files changed, 5 insertions, 8 deletions
diff --git a/lib/rdoc/generators/html_generator.rb b/lib/rdoc/generators/html_generator.rb
index 1f9b808e8d..4348703c30 100644
--- a/lib/rdoc/generators/html_generator.rb
+++ b/lib/rdoc/generators/html_generator.rb
@@ -34,7 +34,7 @@
 # HTML is generated using the Template class.
 #
 
-require 'ftools'
+require 'fileutils'
 
 require 'rdoc/options'
 require 'rdoc/template'
@@ -1025,7 +1025,7 @@ module Generators
     
     def create_source_code_file(code_body)
       meth_path = @html_class.path.sub(/\.html$/, '.src')
-      File.makedirs(meth_path)
+      FileUtils.mkdir_p(meth_path)
       file_path = File.join(meth_path, @seq) + ".html"
 
       template = TemplatePage.new(RDoc::Page::SRC_PAGE)
@@ -1235,7 +1235,8 @@ module Generators
     # directory structure
 
     def gen_sub_directories
-      File.makedirs(FILE_DIR, CLASS_DIR)
+      FileUtils.mkdir_p(FILE_DIR)
+      FileUtils.mkdir_p(CLASS_DIR)
     rescue 
       $stderr.puts $!.message
       exit 1
@@ -1289,7 +1290,7 @@ module Generators
       list.each do |item|
         if item.document_self
           op_file = item.path
-          File.makedirs(File.dirname(op_file))
+          FileUtils.mkdir_p(File.dirname(op_file))
           File.open(op_file, "w") { |file| item.write_on(file) }
         end
       end
diff --git a/lib/rdoc/generators/ri_generator.rb b/lib/rdoc/generators/ri_generator.rb
index c7d0bbd8f0..bf22bc8dba 100644
--- a/lib/rdoc/generators/ri_generator.rb
+++ b/lib/rdoc/generators/ri_generator.rb
@@ -34,8 +34,6 @@
 # HTML is generated using the Template class.
 #
 
-require 'ftools'
-
 require 'rdoc/options'
 require 'rdoc/template'
 require 'rdoc/markup/simple_markup'
diff --git a/lib/rdoc/generators/xml_generator.rb b/lib/rdoc/generators/xml_generator.rb
index 8c1a76d62b..561a9ad694 100644
--- a/lib/rdoc/generators/xml_generator.rb
+++ b/lib/rdoc/generators/xml_generator.rb
@@ -1,6 +1,4 @@
 
-require 'ftools'
-
 require 'rdoc/options'
 require 'rdoc/markup/simple_markup'
 require 'rdoc/markup/simple_markup/to_html'