ruby 1.1b9_13

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

1 files changed, 17 insertions, 8 deletions

diff --git a/configure b/configure
index 50ce61b202..afd3fac15c 100644
--- a/configure
+++ b/configure
@@ -3756,12 +3756,21 @@ if test "$fat_binary" = yes ; then
   CFLAGS="$CFLAGS -pipe $ARCH_FLAG"
 fi
 
+ri_prefix=
+test "$program_prefix" != NONE &&
+  ri_prefix=$program_prefix
+
+ri_suffix=
+test "$program_suffix" != NONE &&
+  ri_suffix=$program_suffix
+
+RUBY_INSTALL_NAME="${ri_prefix}ruby${ri_suffix}"
 cat >> confdefs.h <<EOF
-#define RUBY_LIB "${prefix}/lib/ruby"
+#define RUBY_LIB "${prefix}/lib/${RUBY_INSTALL_NAME}"
 EOF
 
 cat >> confdefs.h <<EOF
-#define RUBY_SITE_LIB "${prefix}/lib/site_ruby"
+#define RUBY_SITE_LIB "${prefix}/lib/${RUBY_INSTALL_NAME}/site_ruby"
 EOF
 
 
@@ -3769,21 +3778,21 @@ if test "$fat_binary" = yes ; then
     arch="fat-${host_os}"
 
     cat >> confdefs.h <<EOF
-#define RUBY_THIN_ARCHLIB "${prefix}/lib/ruby/" __ARCHITECTURE__ "-${host_os}" 
+#define RUBY_THIN_ARCHLIB "${prefix}/lib/${RUBY_INSTALL_NAME}/" __ARCHITECTURE__ "-${host_os}" 
 EOF
 
 
     cat >> confdefs.h <<EOF
-#define RUBY_SITE_THIN_ARCHLIB "${prefix}/lib/ruby/" __ARCHITECTURE__ "-${host_os}" 
+#define RUBY_SITE_THIN_ARCHLIB "${prefix}/lib/${RUBY_INSTALL_NAME}/" __ARCHITECTURE__ "-${host_os}" 
 EOF
 
 
     cat >> confdefs.h <<EOF
-#define RUBY_ARCHLIB "${prefix}/lib/ruby/${arch}"
+#define RUBY_ARCHLIB "${prefix}/lib/${RUBY_INSTALL_NAME}/${arch}"
 EOF
 
     cat >> confdefs.h <<EOF
-#define RUBY_SITE_ARCHLIB "${prefix}/lib/site_ruby/${arch}"
+#define RUBY_SITE_ARCHLIB "${prefix}/lib/${RUBY_INSTALL_NAME}/site_ruby/${arch}"
 EOF
 
     cat >> confdefs.h <<EOF
@@ -3793,11 +3802,11 @@ EOF
 else
     arch="${host_cpu}-${host_os}"
     cat >> confdefs.h <<EOF
-#define RUBY_ARCHLIB "${prefix}/lib/ruby/${arch}"
+#define RUBY_ARCHLIB "${prefix}/lib/${RUBY_INSTALL_NAME}/${arch}"
 EOF
 
     cat >> confdefs.h <<EOF
-#define RUBY_SITE_ARCHLIB "${prefix}/lib/site_ruby/${arch}"
+#define RUBY_SITE_ARCHLIB "${prefix}/lib/${RUBY_INSTALL_NAME}/site_ruby/${arch}"
 EOF
 
     cat >> confdefs.h <<EOF