Fix one more problem with missing COREDIR and clean up setup.rb

diff --git a/lib/rbot/post-config.rb b/lib/rbot/post-config.rb
index 9413df5ef4e8534aa9d10d8ad5f75578360ca253..14ef9876ebb2a5ffe351ca5f9751c651390cce9f 100644 (file)
--- a/lib/rbot/post-config.rb
+++ b/lib/rbot/post-config.rb
@@ -3,6 +3,7 @@ File.open("pkgconfig.rb", "w") {|f|
   f.puts "module Irc"
   f.puts "  module PKGConfig"
   f.puts "    DATADIR = '#{config('datadir')}/rbot'"
+  f.puts "    COREDIR = '#{config('rbdir')}/core'"
   f.puts "  end"
   f.puts "end"
 }

diff --git a/setup.rb b/setup.rb
index e97041d3527130a091b2f4b8934aa39154272403..85a47543afd68833d12bf6fdbd01792bcd50cf16 100755 (executable)
--- a/setup.rb
+++ b/setup.rb
@@ -355,7 +355,6 @@ class ConfigTable_class   # open again
     'site-ruby-common' => 'siteruby',     # For backward compatibility
     'site-ruby'        => 'siterubyver',  # For backward compatibility
     'bin-dir'          => 'bindir',
-    'bin-dir'          => 'bindir',
     'rb-dir'           => 'rbdir',
     'so-dir'           => 'sodir',
     'data-dir'         => 'datadir',
@@ -1197,7 +1196,7 @@ class Installer
   def ruby_scripts
     collect_filenames_auto().select {|n| /\.rb\z/ =~ n }
   end
-  
+
   # picked up many entries from cvs-1.11.1/src/ignore.c
   reject_patterns = %w( 
     core RCSLOG tags TAGS .make.state