@@ -33,4 +33,5 @@ if CONFIG['arch'] =~ /(mswin|mingw)/i then CONFIG['debugflags'] = CONFIG['debugflags'].gsub(/-g/,'') if CONFIG['debugflags'] CONFIG['warnflags'] = CONFIG['warnflags'].gsub(/-Wall/,'') if CONFIG['warnflags'] end -create_makefile('amalgalite/amalgalite3') +subdir = RUBY_VERSION.sub(/\.\d$/,'') +create_makefile("amalgalite/#{subdir}/amalgalite3") ext/amalgalite/extconf.rb @@ -16,12 +16,11 @@ module Amalgalite class Error < ::StandardError; end end -# support for fat binaries on windows -if RUBY_PLATFORM =~ /(mswin|mingw)/i then - require "amalgalite/#{RUBY_VERSION.sub(/\.\d$/,'')}/amalgalite3" -else - require "amalgalite/amalgalite3" -end +# use a version subdirectory for extensions, initially to support windows, but +# why make a special case, it doesn't hurt anyone to have an extra subdir +# someplace +require "amalgalite/#{RUBY_VERSION.sub(/\.\d$/,'')}/amalgalite3" + require 'amalgalite/aggregate' require 'amalgalite/blob' require 'amalgalite/boolean' lib/amalgalite.rb e8272b65be17d103a3bf9b73a751a02460f6d965 Jeremy Hinegardner jeremy@hinegardner.org http://github.com/copiousfreetime/amalgalite/commit/34915a7eadfc858568b7f8f47b262d682f2d5a87 34915a7eadfc858568b7f8f47b262d682f2d5a87 2009-07-03T10:36:53-07:00 2009-07-03T10:36:53-07:00 Use a version subdirectory on every platform df382c882b08aa923d34f03838a421c0acfe0bc4 Jeremy Hinegardner jeremy@hinegardner.org