1 files changed, 10 insertions, 24 deletions
diff --git a/ext/tk/lib/tkextlib/tcllib.rb b/ext/tk/lib/tkextlib/tcllib.rb
index 56f21556a..2955416b2 100644
--- a/ext/tk/lib/tkextlib/tcllib.rb
+++ b/ext/tk/lib/tkextlib/tcllib.rb
@@ -8,50 +8,36 @@ require 'tk'
 # call setup script for general 'tkextlib' libraries
 require 'tkextlib/setup.rb'
 
-# library directory
-dir = File.expand_path(__FILE__).sub(/#{File.extname(__FILE__)}$/, '')
-
 # call setup script
-require File.join(dir, 'setup.rb')
+require 'tkextlib/tcllib/setup.rb'
 
 # package:: autoscroll
-#require 'tkextlib/tcllib/autoscroll'
-require File.join(dir, 'autoscroll')
+require 'tkextlib/tcllib/autoscroll'
 
 # package:: cursor
-#require 'tkextlib/tcllib/cursor'
-require File.join(dir, 'cursor')
+require 'tkextlib/tcllib/cursor'
 
 # package:: style
-#require 'tkextlib/tcllib/style'
-require File.join(dir, 'style')
+require 'tkextlib/tcllib/style'
 
 
 # autoload
 module Tk
   module Tcllib
-    dir = File.expand_path(__FILE__).sub(/#{File.extname(__FILE__)}$/, '')
-
     # package:: ctext
-    #autoload :CText,      'tkextlib/tcllib/ctext'
-    autoload :CText,      File.join(dir, 'ctext')
+    autoload :CText,      'tkextlib/tcllib/ctext'
 
     # package:: datefield
-    #autoload :Datefield,  'tkextlib/tcllib/datefield'
-    #autoload :DateField,  'tkextlib/tcllib/datefield'
-    autoload :Datefield,  File.join(dir, 'datefield')
-    autoload :DateField,  File.join(dir, 'datefield')
+    autoload :Datefield,  'tkextlib/tcllib/datefield'
+    autoload :DateField,  'tkextlib/tcllib/datefield'
 
     # package:: ipentry
-    #autoload :IP_Entry,   'tkextlib/tcllib/ip_entry'
-    autoload :IP_Entry,   File.join(dir, 'ip_entry')
+    autoload :IP_Entry,   'tkextlib/tcllib/ip_entry'
 
     # package:: Plotchart
-    #autoload :Plotchart,  'tkextlib/tcllib/plotchart'
-    autoload :Plotchart,  File.join(dir, 'plotchart')
+    autoload :Plotchart,  'tkextlib/tcllib/plotchart'
 
     # package:: tkpiechart
-    #autoload :Tkpiechart, 'tkextlib/tcllib/tkpiechart'
-    autoload :Tkpiechart, File.join(dir, 'tkpiechart')
+    autoload :Tkpiechart, 'tkextlib/tcllib/tkpiechart'
   end
 end