From 6c8ae98039e8481c694599dc23863e763625c444 Mon Sep 17 00:00:00 2001 From: "Jeroen van Meeuwen (OGD)" Date: Tue, 22 Dec 2009 01:34:35 +0100 Subject: Provide the following searchpath for ruby-1.9.1: /usr/local/lib{,64}/ruby/1.9.1/ /usr/local/lib{,64}/ruby/1.9/ /usr/local/lib{,64}/ruby/ /usr/local/share/ruby/1.9.1/ /usr/local/share/ruby/1.9/ /usr/local/share/ruby/ /usr/lib{,64}/ruby/1.9.1/ /usr/lib{,64}/ruby/1.9/ /usr/lib{,64}/ruby/ /usr/share/ruby/1.9.1/ /usr/share/ruby/1.9/ /usr/share/ruby/ --- ruby.c | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) (limited to 'ruby.c') diff --git a/ruby.c b/ruby.c index b50ee4507..854854b0a 100644 --- a/ruby.c +++ b/ruby.c @@ -407,25 +407,19 @@ ruby_init_loadpath_safe(int safe_level) incpush(RUBY_RELATIVE(RUBY_SEARCH_PATH)); #endif - incpush(RUBY_RELATIVE(RUBY_SITE_LIB2)); -#ifdef RUBY_SITE_THIN_ARCHLIB - incpush(RUBY_RELATIVE(RUBY_SITE_THIN_ARCHLIB)); -#endif - incpush(RUBY_RELATIVE(RUBY_SITE_ARCHLIB)); + incpush(RUBY_RELATIVE(RUBY_SITE_ARCH)); + incpush(RUBY_RELATIVE(RUBY_SITE_ARCH2)); + incpush(RUBY_RELATIVE(RUBY_SITE_ARCH3)); incpush(RUBY_RELATIVE(RUBY_SITE_LIB)); + incpush(RUBY_RELATIVE(RUBY_SITE_LIB2)); + incpush(RUBY_RELATIVE(RUBY_SITE_LIB3)); - incpush(RUBY_RELATIVE(RUBY_VENDOR_LIB2)); -#ifdef RUBY_VENDOR_THIN_ARCHLIB - incpush(RUBY_RELATIVE(RUBY_VENDOR_THIN_ARCHLIB)); -#endif - incpush(RUBY_RELATIVE(RUBY_VENDOR_ARCHLIB)); + incpush(RUBY_RELATIVE(RUBY_VENDOR_ARCH)); + incpush(RUBY_RELATIVE(RUBY_VENDOR_ARCH2)); + incpush(RUBY_RELATIVE(RUBY_VENDOR_ARCH3)); incpush(RUBY_RELATIVE(RUBY_VENDOR_LIB)); - - incpush(RUBY_RELATIVE(RUBY_LIB)); -#ifdef RUBY_THIN_ARCHLIB - incpush(RUBY_RELATIVE(RUBY_THIN_ARCHLIB)); -#endif - incpush(RUBY_RELATIVE(RUBY_ARCHLIB)); + incpush(RUBY_RELATIVE(RUBY_VENDOR_LIB2)); + incpush(RUBY_RELATIVE(RUBY_VENDOR_LIB3)); if (safe_level == 0) { incpush("."); -- cgit