summaryrefslogtreecommitdiffstats
path: root/configure.in
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2000-08-03 09:50:41 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2000-08-03 09:50:41 +0000
commit8884ab5e392549c34d79bcb8b32c13c9166626d4 (patch)
tree8cb43e1d3e273d64588df7db13cd2aeb7ca99b65 /configure.in
parentbb70bf13b22159d39c29e928294f1e9bca7f700e (diff)
downloadruby-8884ab5e392549c34d79bcb8b32c13c9166626d4.tar.gz
ruby-8884ab5e392549c34d79bcb8b32c13c9166626d4.tar.xz
ruby-8884ab5e392549c34d79bcb8b32c13c9166626d4.zip
matz - nakada win32 patch
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@872 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'configure.in')
-rw-r--r--configure.in14
1 files changed, 12 insertions, 2 deletions
diff --git a/configure.in b/configure.in
index c108d8006..163f4d2e3 100644
--- a/configure.in
+++ b/configure.in
@@ -89,6 +89,7 @@ case "$target_os" in
AC_CHECK_TOOL(DLLWRAP, dllwrap)
AC_CHECK_TOOL(AS, as)
AC_CHECK_TOOL(DLLTOOL, dlltool)
+ AC_CHECK_TOOL(WINDRES, windres)
;;
esac
@@ -878,13 +879,22 @@ test "$program_suffix" != NONE &&
ri_suffix=$program_suffix
RUBY_INSTALL_NAME="${ri_prefix}ruby${ri_suffix}"
-RUBY_LIB_PREFIX="${prefix}/lib/ruby"
+case "$target_os" in
+ cygwin*|mingw*|*djgpp*)
+ RUBY_LIB_PREFIX="/lib/ruby"
+ SITEDIR='/lib/ruby/site_ruby'
+ ;;
+ *)
+ RUBY_LIB_PREFIX="${prefix}/lib/ruby"
+ SITEDIR='${prefix}/lib/ruby/site_ruby'
+ ;;
+esac
RUBY_LIB_PATH="${RUBY_LIB_PREFIX}/${MAJOR}.${MINOR}"
sitedir='${prefix}/lib/ruby/site_ruby'
AC_ARG_WITH(sitedir,
[--with-sitedir=DIR site libraries in DIR [PREFIX/lib/ruby/site_ruby]],
[sitedir=$withval])
-RUBY_SITE_LIB_PATH=`eval "echo ${sitedir}"`
+RUBY_SITE_LIB_PATH=`eval "echo ${SITEDIR}"`
RUBY_SITE_LIB_PATH2="${RUBY_SITE_LIB_PATH}/${MAJOR}.${MINOR}"
AC_DEFINE_UNQUOTED(RUBY_LIB, "${RUBY_LIB_PATH}")