|
 |
70c675d |
diff -ur ruby-1.8.6-p383.0-deadcode/configure.in ruby-1.8.6-p383/configure.in
|
|
|
70c675d |
--- ruby-1.8.6-p383.0-deadcode/configure.in 2009-07-20 15:24:22.000000000 +0200
|
|
|
70c675d |
+++ ruby-1.8.6-p383/configure.in 2009-10-22 16:37:13.729623476 +0200
|
|
|
70c675d |
@@ -1613,6 +1613,13 @@
|
|
 |
38b1bf1 |
rubyw_install_name="$RUBYW_INSTALL_NAME"
|
|
|
38b1bf1 |
;;
|
|
|
38b1bf1 |
esac
|
|
|
38b1bf1 |
+
|
|
|
38b1bf1 |
+AC_ARG_WITH(ruby-prefix,
|
|
|
38b1bf1 |
+ AC_HELP_STRING([--with-ruby-prefix], [build ruby with the special library prefix.])
|
|
|
38b1bf1 |
+ ,,
|
|
|
38b1bf1 |
+ with_ruby_prefix=no)
|
|
|
38b1bf1 |
+
|
|
|
38b1bf1 |
+if test "x$with_ruby_prefix" = "x"; then
|
|
|
38b1bf1 |
case "$target_os" in
|
|
|
38b1bf1 |
cygwin*|mingw*|*djgpp*|os2-emx*)
|
|
|
38b1bf1 |
RUBY_LIB_PREFIX="/lib/ruby"
|
|
|
70c675d |
@@ -1621,20 +1628,30 @@
|
|
|
70c675d |
RUBY_LIB_PREFIX="`eval "echo ${libdir}"`/ruby"
|
|
|
38b1bf1 |
;;
|
|
|
38b1bf1 |
esac
|
|
|
38b1bf1 |
+else
|
|
|
70c675d |
+ RUBY_LIB_PREFIX="${with_ruby_prefix}/ruby"
|
|
|
38b1bf1 |
+fi
|
|
|
38b1bf1 |
RUBY_LIB_PATH="${RUBY_LIB_PREFIX}/${MAJOR}.${MINOR}"
|
|
|
38b1bf1 |
+RUBY_LIB_PATH2="${libdir}/ruby/${MAJOR}.${MINOR}"
|
|
|
38b1bf1 |
|
|
|
38b1bf1 |
AC_ARG_WITH(sitedir,
|
|
|
38b1bf1 |
[ --with-sitedir=DIR site libraries in DIR [PREFIX/lib/ruby/site_ruby]],
|
|
|
38b1bf1 |
[sitedir=$withval],
|
|
|
70c675d |
[sitedir="`eval "echo ${libdir}"`/ruby/site_ruby"])
|
|
|
5e0f0e1 |
-SITE_DIR=`eval echo \\"${sitedir}\\"`
|
|
|
5e0f0e1 |
+SITE_DIR=`eval echo \\"${sitedir}\\" | sed -e "s/lib64/lib/"`
|
|
|
3feca6f |
+_fc_sitedir="\$(DESTDIR)${sitedir}"
|
|
|
5bb64d0 |
+SITE_DIR2=`eval echo \\"${_fc_sitedir}\\"`
|
|
|
5e0f0e1 |
+sitedir=`eval echo \\"${sitedir}\\" | sed -e "s/lib64/lib/"`
|
|
|
70c675d |
+
|
|
|
38b1bf1 |
case "$target_os" in
|
|
|
38b1bf1 |
cygwin*|mingw*|*djgpp*|os2-emx*)
|
|
|
38b1bf1 |
RUBY_SITE_LIB_PATH="`expr "$SITE_DIR" : "$prefix\(/.*\)"`" ||
|
|
|
38b1bf1 |
RUBY_SITE_LIB_PATH="$SITE_DIR";;
|
|
|
38b1bf1 |
*)
|
|
|
38b1bf1 |
- RUBY_SITE_LIB_PATH="$SITE_DIR";;
|
|
|
38b1bf1 |
+ RUBY_SITE_LIB_PATH="$SITE_DIR";
|
|
|
38b1bf1 |
+ RUBY_SITE_LIB_PATH2="$SITE_DIR2";;
|
|
|
38b1bf1 |
esac
|
|
|
38b1bf1 |
+RUBY_SITE_LIB_PATH3="${RUBY_SITE_LIB_PATH2}/${MAJOR}.${MINOR}"
|
|
|
38b1bf1 |
RUBY_SITE_LIB_PATH2="${RUBY_SITE_LIB_PATH}/${MAJOR}.${MINOR}"
|
|
|
38b1bf1 |
|
|
|
38b1bf1 |
AC_DEFINE_UNQUOTED(RUBY_LIB, "${RUBY_LIB_PATH}")
|
|
|
70c675d |
@@ -1644,6 +1661,7 @@
|
|
|
38b1bf1 |
AC_SUBST(arch)dnl
|
|
|
38b1bf1 |
AC_SUBST(sitearch)dnl
|
|
|
38b1bf1 |
AC_SUBST(sitedir)dnl
|
|
|
38b1bf1 |
+AC_SUBST(_fc_sitedir)dnl
|
|
|
38b1bf1 |
|
|
|
38b1bf1 |
configure_args=$ac_configure_args
|
|
|
38b1bf1 |
AC_SUBST(configure_args)dnl
|
|
|
70c675d |
@@ -1652,7 +1670,7 @@
|
|
|
38b1bf1 |
arch="fat-${target_os}"
|
|
|
38b1bf1 |
|
|
|
38b1bf1 |
AC_DEFINE_UNQUOTED(RUBY_THIN_ARCHLIB,
|
|
|
38b1bf1 |
- "${RUBY_LIB_PATH}/" __ARCHITECTURE__ "-${target_os}")
|
|
|
38b1bf1 |
+ "${RUBY_LIB_PATH2}/" __ARCHITECTURE__ "-${target_os}")
|
|
|
38b1bf1 |
|
|
|
38b1bf1 |
AC_DEFINE_UNQUOTED(RUBY_SITE_THIN_ARCHLIB,
|
|
|
38b1bf1 |
"${RUBY_SITE_LIB_PATH}/" __ARCHITECTURE__ "-${target_os}")
|
|
|
70c675d |
@@ -1667,8 +1685,8 @@
|
|
|
38b1bf1 |
*) sitearch="${arch}" ;;
|
|
|
38b1bf1 |
esac
|
|
|
38b1bf1 |
|
|
|
38b1bf1 |
-AC_DEFINE_UNQUOTED(RUBY_ARCHLIB, "${RUBY_LIB_PATH}/${arch}")
|
|
|
38b1bf1 |
-AC_DEFINE_UNQUOTED(RUBY_SITE_ARCHLIB, "${RUBY_SITE_LIB_PATH2}/${sitearch}")
|
|
|
38b1bf1 |
+AC_DEFINE_UNQUOTED(RUBY_ARCHLIB, "${RUBY_LIB_PATH2}/${arch}")
|
|
|
38b1bf1 |
+AC_DEFINE_UNQUOTED(RUBY_SITE_ARCHLIB, "${RUBY_SITE_LIB_PATH3}/${sitearch}")
|
|
|
38b1bf1 |
|
|
|
38b1bf1 |
AC_ARG_WITH(search-path,
|
|
|
38b1bf1 |
[ --with-search-path=DIR specify the additional search path],
|
|
|
70c675d |
Only in ruby-1.8.6-p383/: configure.in.orig
|
|
|
70c675d |
Only in ruby-1.8.6-p383/: configure.in.rej
|
|
|
70c675d |
diff -ur ruby-1.8.6-p383.0-deadcode/mkconfig.rb ruby-1.8.6-p383/mkconfig.rb
|
|
|
70c675d |
--- ruby-1.8.6-p383.0-deadcode/mkconfig.rb 2008-06-07 18:37:10.000000000 +0200
|
|
|
70c675d |
+++ ruby-1.8.6-p383/mkconfig.rb 2009-10-22 16:30:55.776872493 +0200
|
|
|
70c675d |
@@ -139,10 +139,10 @@
|
|
|
3f68db5 |
print(*v_others)
|
|
|
38b1bf1 |
print <
|
|
|
38b1bf1 |
CONFIG["ruby_version"] = "$(MAJOR).$(MINOR)"
|
|
|
38b1bf1 |
- CONFIG["rubylibdir"] = "$(libdir)/ruby/$(ruby_version)"
|
|
|
38b1bf1 |
- CONFIG["archdir"] = "$(rubylibdir)/$(arch)"
|
|
|
38b1bf1 |
+ CONFIG["rubylibdir"] = "$(prefix)/lib/ruby/$(ruby_version)"
|
|
|
38b1bf1 |
+ CONFIG["archdir"] = "$(libdir)/ruby/$(ruby_version)/$(arch)"
|
|
|
3feca6f |
CONFIG["sitelibdir"] = "$(sitedir)/$(ruby_version)"
|
|
|
3feca6f |
- CONFIG["sitearchdir"] = "$(sitelibdir)/$(sitearch)"
|
|
|
38b1bf1 |
+ CONFIG["sitearchdir"] = "$(_fc_sitedir)/$(ruby_version)/$(sitearch)"
|
|
|
38b1bf1 |
CONFIG["topdir"] = File.dirname(__FILE__)
|
|
|
38b1bf1 |
MAKEFILE_CONFIG = {}
|
|
|
38b1bf1 |
CONFIG.each{|k,v| MAKEFILE_CONFIG[k] = v.dup}
|