SOURCES: ruby-vendordir.patch - fix -vendordir.patch, fix load-pat...

[twittner]

Author: twittner                     Date: Sun Dec 30 18:21:17 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- fix -vendordir.patch, fix load-path
- rel. 4

---- Files affected:
SOURCES:
   ruby-vendordir.patch (1.4 -> 1.5) 

---- Diffs:

================================================================
Index: SOURCES/ruby-vendordir.patch
diff -u SOURCES/ruby-vendordir.patch:1.4 SOURCES/ruby-vendordir.patch:1.5
--- SOURCES/ruby-vendordir.patch:1.4	Mon Dec 10 23:36:31 2007
+++ SOURCES/ruby-vendordir.patch	Sun Dec 30 19:21:12 2007
@@ -9,7 +9,7 @@
 +	    [  --with-vendordir=DIR      vendor libraries in DIR [LIBDIR/ruby/vendor_ruby]],
 +            [vendordir=$withval],
 +            [vendordir='${libdir}/ruby/vendor_ruby'])
-+VENDOR_DIR="`eval \"echo ${vendordir}\"`"
++VENDOR_DIR=`eval echo \\"${vendordir}\\"`
 +case "$target_os" in
 +  cygwin*|mingw*|*djgpp*|os2_emx*)
 +    RUBY_VENDOR_LIB_PATH="`expr "$VENDOR_DIR" : "$prefix\(/.*\)"`" ||
@@ -57,18 +57,6 @@
  
  AC_ARG_WITH(search-path,
  		[  --with-search-path=DIR specify the additional search path],
-diff -ur ruby-1.8.6-p111-o/configure.in.orig ruby-1.8.6-p111/configure.in.orig
---- ruby-1.8.6-p111-o/configure.in.orig	2007-12-07 19:02:05.000000000 -0700
-+++ ruby-1.8.6-p111/configure.in.orig	2007-12-07 21:42:59.000000000 -0700
-@@ -1552,7 +1552,7 @@
-     RUBY_LIB_PREFIX="/lib/ruby"
-     ;;
-   *)
--    RUBY_LIB_PREFIX="${prefix}/lib/ruby"
-+    RUBY_LIB_PREFIX="${libdir}/ruby"
-     ;;
- esac
- RUBY_LIB_PATH="${RUBY_LIB_PREFIX}/${MAJOR}.${MINOR}"
 diff -ur ruby-1.8.6-p111-o/instruby.rb ruby-1.8.6-p111/instruby.rb
 --- ruby-1.8.6-p111-o/instruby.rb	2007-12-07 18:57:32.000000000 -0700
 +++ ruby-1.8.6-p111/instruby.rb	2007-12-07 21:44:21.000000000 -0700
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/ruby-vendordir.patch?r1=1.4&r2=1.5&f=u