Description: Change installation location of Ruby site packages.
Author: Roberto C. Sanchez <roberto@connexer.com>
--- trunk.orig/configure
+++ trunk/configure
@@ -15015,7 +15015,7 @@
 then
     RUBY_CFLAGS="-I${RUBY_PREFIX}"
 
-    RUBY_SITE_PACKAGES=`ruby -e 'require "rbconfig"; print Config::CONFIG["sitedir"], "\n"'`
+    RUBY_SITE_PACKAGES=`ruby -e 'require "rbconfig"; print Config::CONFIG["libdir"], "\n"'`
 
 
 $as_echo "#define HAVE_RUBY 1" >>confdefs.h
--- trunk.orig/configure.in
+++ trunk/configure.in
@@ -176,7 +176,7 @@
 then
     RUBY_CFLAGS="-I${RUBY_PREFIX}" 
     AC_SUBST(RUBY_CFLAGS)
-    RUBY_SITE_PACKAGES=[`ruby -e 'require "rbconfig"; print Config::CONFIG["sitedir"], "\n"'`]
+    RUBY_SITE_PACKAGES=[`ruby -e 'require "rbconfig"; print Config::CONFIG["libdir"], "\n"'`]
     AC_SUBST(RUBY_SITE_PACKAGES)
     AC_DEFINE(HAVE_RUBY, 1, Define if you have ruby)
 fi
--- trunk.orig/src/ruby/Makefile.am
+++ trunk/src/ruby/Makefile.am
@@ -2,34 +2,13 @@
 
 all-local:
 	bash ./make_ruby.sh $(CXX) $(CXXFLAGS) $(LIBS)
-	mkdir -p $(top_builddir)/lib/ruby
-	ln -sf ../../src/ruby/quickfix_ruby.rb $(top_builddir)/lib/ruby/quickfix_ruby.rb
-	ln -sf ../../src/ruby/quickfix_fields.rb $(top_builddir)/lib/ruby/quickfix_fields.rb
-	ln -sf ../../src/ruby/quickfix40.rb $(top_builddir)/lib/ruby/quickfix40.rb
-	ln -sf ../../src/ruby/quickfix41.rb $(top_builddir)/lib/ruby/quickfix41.rb
-	ln -sf ../../src/ruby/quickfix42.rb $(top_builddir)/lib/ruby/quickfix42.rb
-	ln -sf ../../src/ruby/quickfix43.rb $(top_builddir)/lib/ruby/quickfix43.rb
-	ln -sf ../../src/ruby/quickfix44.rb $(top_builddir)/lib/ruby/quickfix44.rb
-	ln -sf ../../src/ruby/quickfix50.rb $(top_builddir)/lib/ruby/quickfix50.rb
-	ln -sf ../../src/ruby/quickfix50sp1.rb $(top_builddir)/lib/ruby/quickfix50sp1.rb
-	ln -sf ../../src/ruby/quickfix50sp2.rb $(top_builddir)/lib/ruby/quickfix50sp2.rb
-	ln -sf ../../src/ruby/quickfixt11.rb $(top_builddir)/lib/ruby/quickfixt11.rb
-	ln -sf ../../src/ruby/quickfix.so $(top_builddir)/lib/ruby/quickfix.so
-	ln -sf ../../src/ruby/quickfix.bundle $(top_builddir)/lib/ruby/quickfix.bundle
-
-	bash ./link.sh $(top_builddir)/lib/ruby quickfix.so quickfix.bundle
 
 clean-local:
 	make -f Makefile.ruby clean
-	rm -rf $(top_builddir)/lib/ruby
 
 install-exec-local:
-	cp -f $(top_builddir)/lib/ruby/*.rb $(RUBY_SITE_PACKAGES)
-	cp -f $(top_builddir)/lib/ruby/quickfix.so $(RUBY_SITE_PACKAGES)
-	cp -f $(top_builddir)/lib/ruby/quickfix.bundle $(RUBY_SITE_PACKAGES)
+	make -f Makefile.ruby install
 
 uninstall-local:
-	rm -rf $(RUBY_SITE_PACKAGES)/quickfix*.rb
-	rm -rf $(RUBY_SITE_PACKAGES)/quickfix*.so
-	rm -rf $(RUBY_SITE_PACKAGES)/quickfix.bundle
+	make -f Makefile.ruby install
 
--- trunk.orig/src/ruby/Makefile.in
+++ trunk/src/ruby/Makefile.in
@@ -426,36 +426,15 @@
 
 all-local:
 	bash ./make_ruby.sh $(CXX) $(CXXFLAGS) $(LIBS)
-	mkdir -p $(top_builddir)/lib/ruby
-	ln -sf ../../src/ruby/quickfix_ruby.rb $(top_builddir)/lib/ruby/quickfix_ruby.rb
-	ln -sf ../../src/ruby/quickfix_fields.rb $(top_builddir)/lib/ruby/quickfix_fields.rb
-	ln -sf ../../src/ruby/quickfix40.rb $(top_builddir)/lib/ruby/quickfix40.rb
-	ln -sf ../../src/ruby/quickfix41.rb $(top_builddir)/lib/ruby/quickfix41.rb
-	ln -sf ../../src/ruby/quickfix42.rb $(top_builddir)/lib/ruby/quickfix42.rb
-	ln -sf ../../src/ruby/quickfix43.rb $(top_builddir)/lib/ruby/quickfix43.rb
-	ln -sf ../../src/ruby/quickfix44.rb $(top_builddir)/lib/ruby/quickfix44.rb
-	ln -sf ../../src/ruby/quickfix50.rb $(top_builddir)/lib/ruby/quickfix50.rb
-	ln -sf ../../src/ruby/quickfix50sp1.rb $(top_builddir)/lib/ruby/quickfix50sp1.rb
-	ln -sf ../../src/ruby/quickfix50sp2.rb $(top_builddir)/lib/ruby/quickfix50sp2.rb
-	ln -sf ../../src/ruby/quickfixt11.rb $(top_builddir)/lib/ruby/quickfixt11.rb
-	ln -sf ../../src/ruby/quickfix.so $(top_builddir)/lib/ruby/quickfix.so
-	ln -sf ../../src/ruby/quickfix.bundle $(top_builddir)/lib/ruby/quickfix.bundle
-
-	bash ./link.sh $(top_builddir)/lib/ruby quickfix.so quickfix.bundle
 
 clean-local:
 	make -f Makefile.ruby clean
-	rm -rf $(top_builddir)/lib/ruby
 
 install-exec-local:
-	cp -f $(top_builddir)/lib/ruby/*.rb $(RUBY_SITE_PACKAGES)
-	cp -f $(top_builddir)/lib/ruby/quickfix.so $(RUBY_SITE_PACKAGES)
-	cp -f $(top_builddir)/lib/ruby/quickfix.bundle $(RUBY_SITE_PACKAGES)
+	make -f Makefile.ruby install
 
 uninstall-local:
-	rm -rf $(RUBY_SITE_PACKAGES)/quickfix*.rb
-	rm -rf $(RUBY_SITE_PACKAGES)/quickfix*.so
-	rm -rf $(RUBY_SITE_PACKAGES)/quickfix.bundle
+	make -f Makefile.ruby install
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.