2000-02-17

git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@618 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 12 insertions, 3 deletions

diff --git a/configure b/configure
index 6b40c2fc3..af51fc3c6 100644
--- a/configure
+++ b/configure
@@ -4966,16 +4966,24 @@ test "$program_suffix" != NONE &&
   ri_suffix=$program_suffix
 
 RUBY_INSTALL_NAME="${ri_prefix}ruby${ri_suffix}"
-RUBY_LIB_PATH="${prefix}/lib/ruby/${MAJOR}.${MINOR}"
+RUBY_LIB_PREFIX="${prefix}/lib/ruby"
+RUBY_LIB_PATH="${RUBY_LIB_PREFIX}/${MAJOR}.${MINOR}"
+RUBY_SITE_LIB_PATH="${RUBY_LIB_PREFIX}/site_ruby"
+RUBY_SITE_LIB_PATH2="${RUBY_SITE_LIB_PATH}/${MAJOR}.${MINOR}"
+
 cat >> confdefs.h <<EOF
 #define RUBY_LIB "${RUBY_LIB_PATH}"
 EOF
 
-RUBY_SITE_LIB_PATH="${RUBY_LIB_PATH}/site_ruby"
 cat >> confdefs.h <<EOF
 #define RUBY_SITE_LIB "${RUBY_SITE_LIB_PATH}"
 EOF
 
+cat >> confdefs.h <<EOF
+#define RUBY_SITE_LIB2 "${RUBY_SITE_LIB_PATH2}"
+EOF
+
+
 
 configure_args=$ac_configure_args
 
@@ -5002,12 +5010,13 @@ else
 EOF
 
 fi
+
 cat >> confdefs.h <<EOF
 #define RUBY_ARCHLIB "${RUBY_LIB_PATH}/${arch}"
 EOF
 
 cat >> confdefs.h <<EOF
-#define RUBY_SITE_ARCHLIB "${RUBY_SITE_LIB_PATH}/${arch}"
+#define RUBY_SITE_ARCHLIB "${RUBY_SITE_LIB_PATH2}/${arch}"
 EOF