* configure.in: --with-vendordir implemented.

* mkconfig.rb: add config to vendorlibdir and vendorarchdir.

* instruby.rb: make vendor library directories.

* ruby.c: insert vendor library directories into load path.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13806 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 4 insertions, 2 deletions

diff --git a/instruby.rb b/instruby.rb
index a4c4563467..6634a70a3e 100755
--- a/instruby.rb
+++ b/instruby.rb
@@ -175,6 +175,8 @@ rubylibdir = CONFIG["rubylibdir"]
 archlibdir = CONFIG["archdir"]
 sitelibdir = CONFIG["sitelibdir"]
 sitearchlibdir = CONFIG["sitearchdir"]
+vendorlibdir = CONFIG["vendorlibdir"]
+vendorarchlibdir = CONFIG["vendorarchdir"]
 mandir = File.join(CONFIG["mandir"], "man")
 configure_args = Shellwords.shellwords(CONFIG["configure_args"])
 enable_shared = CONFIG["ENABLE_SHARED"] == 'yes'
@@ -214,7 +216,7 @@ if $extout
   extout = "#$extout"
   install?(:ext, :arch, :'ext-arch') do
     puts "installing extension objects"
-    makedirs [archlibdir, sitearchlibdir, archhdrdir]
+    makedirs [archlibdir, sitearchlibdir, vendorarchlibdir, archhdrdir]
     if noinst = CONFIG["no_install_files"] and noinst.empty?
       noinst = nil
     end
@@ -224,7 +226,7 @@ if $extout
   install?(:ext, :comm, :'ext-comm') do
     puts "installing extension scripts"
     hdrdir = rubyhdrdir + "/ruby"
-    makedirs [rubylibdir, sitelibdir, hdrdir]
+    makedirs [rubylibdir, sitelibdir, vendorlibdir, hdrdir]
     install_recursive("#{extout}/common", rubylibdir)
     install_recursive("#{extout}/include/ruby", hdrdir, :glob => "*.h")
   end