SOURCES: ruby-LIB_PREFIX.patch - fixed ruby load modules paths - r...

[twittner]

Author: twittner                     Date: Sat Dec 23 20:02:43 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- fixed ruby load modules paths - ruby_site are back
  (POSIXLY_CORRECT && autoconf-2.60 && shell quotation issue)
  thanks to arekm for an apt suggestion
- rel. 4

---- Files affected:
SOURCES:
   ruby-LIB_PREFIX.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/ruby-LIB_PREFIX.patch
diff -u SOURCES/ruby-LIB_PREFIX.patch:1.1 SOURCES/ruby-LIB_PREFIX.patch:1.2
--- SOURCES/ruby-LIB_PREFIX.patch:1.1	Tue Jan  6 17:45:22 2004
+++ SOURCES/ruby-LIB_PREFIX.patch	Sat Dec 23 21:02:37 2006
@@ -1,13 +1,26 @@
-diff -dur ruby-1.8.1.orig/configure.in ruby-1.8.1/configure.in
---- ruby-1.8.1.orig/configure.in	2003-12-24 20:19:12.000000000 +0100
-+++ ruby-1.8.1/configure.in	2004-01-06 17:33:27.052504945 +0100
-@@ -1375,7 +1375,7 @@
-     RUBY_LIB_PREFIX="/lib/ruby"
-     ;;
+--- ../configure.in	2006-12-23 20:00:45.000000000 +0100
++++ configure.in	2006-12-23 20:42:21.000000000 +0100
+@@ -1516,17 +1516,19 @@
+ RUBY_LIB_PATH="${RUBY_LIB_PREFIX}/${MAJOR}.${MINOR}"
+ 
+ AC_ARG_WITH(sitedir,
+-	    [  --with-sitedir=DIR      site libraries in DIR [PREFIX/lib/ruby/site_ruby]],
++	    [  --with-sitedir=DIR      site libraries in DIR [LIBDIR/lib/ruby/site_ruby]],
+             [sitedir=$withval],
+-            [sitedir='${prefix}/lib/ruby/site_ruby'])
+-SITE_DIR="`eval \"echo ${sitedir}\"`"
++            [sitedir='${libdir}/ruby/site_ruby'])
++SITE_DIR="$(eval echo ${sitedir})"
++echo "SITE_DIR: $SITE_DIR"
+ case "$target_os" in
+   cygwin*|mingw*|*djgpp*|os2-emx*)
+-    RUBY_SITE_LIB_PATH="`expr "$SITE_DIR" : "$prefix\(/.*\)"`" ||
++    RUBY_SITE_LIB_PATH=$(expr "$SITE_DIR" : "$prefix\(/.*\)") ||
+     RUBY_SITE_LIB_PATH="$SITE_DIR";;
    *)
--    RUBY_LIB_PREFIX="${prefix}/lib/ruby"
-+    RUBY_LIB_PREFIX="${libdir}/ruby"
-     ;;
+     RUBY_SITE_LIB_PATH="$SITE_DIR";;
  esac
- RUBY_LIB_PATH="${RUBY_LIB_PREFIX}/${MAJOR}.${MINOR}"
-Only in ruby-1.8.1: configure.in~
++echo "RUBY_SITE_LIB_PATH: $RUBY_SITE_LIB_PATH"
+ RUBY_SITE_LIB_PATH2="${RUBY_SITE_LIB_PATH}/${MAJOR}.${MINOR}"
+ 
+ AC_DEFINE_UNQUOTED(RUBY_LIB, "${RUBY_LIB_PATH}")
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/ruby-LIB_PREFIX.patch?r1=1.1&r2=1.2&f=u