SOURCES: ruby-LIB_PREFIX.patch - reverted (I've mixed sth)

[twittner]

Author: twittner                     Date: Mon Dec 25 13:31:00 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- reverted (I've mixed sth)

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

---- Diffs:

================================================================
Index: SOURCES/ruby-LIB_PREFIX.patch
diff -u SOURCES/ruby-LIB_PREFIX.patch:1.2 SOURCES/ruby-LIB_PREFIX.patch:1.3
--- SOURCES/ruby-LIB_PREFIX.patch:1.2	Sat Dec 23 21:02:37 2006
+++ SOURCES/ruby-LIB_PREFIX.patch	Mon Dec 25 14:30:54 2006
@@ -1,26 +1,13 @@
---- ../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";;
+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"
+     ;;
    *)
-     RUBY_SITE_LIB_PATH="$SITE_DIR";;
+-    RUBY_LIB_PREFIX="${prefix}/lib/ruby"
++    RUBY_LIB_PREFIX="${libdir}/ruby"
+     ;;
  esac
-+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}")
+ RUBY_LIB_PATH="${RUBY_LIB_PREFIX}/${MAJOR}.${MINOR}"
+Only in ruby-1.8.1: configure.in~
================================================================

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