Ruby lib versions are out of date in conf file, and doc install is broken on mips64

[Jan Rovins]

===================================================================
--- package/ruby/ruby/ruby.conf (revision 41957)
+++ package/ruby/ruby/ruby.conf (working copy)
@@ -24,19 +24,20 @@

[ "$SDECFG_STATIC" != 1 ] && var_append confopt ' ' '--enable-shared'

-var_append makeinstopt ' ' 'install-doc'

+# Does this need removing or fixing? we are upto version 1.9 now
set_rubylib() {
- RUBYLIB="$libdir/ruby/1.8"
+ RUBYLIB="$libdir/ruby/1.9"

- for x in $(find $builddir/ruby-1.8.2/ext -type d) ; do
+ for x in $(find $builddir/ruby-1.9.2/ext -type d) ; do
RUBYLIB="${RUBYLIB}:$x"
done
export RUBYLIB
}

hook_add inmake 5 "set_rubylib"
-var_append makeinstopt ' ' 'install-doc'
+# trouble on mips64
+[ $arch != mips64 ] && var_append makeinstopt ' ' 'install-doc'

[[ $libdir = *lib64 ]] && hook_add preconf 5 "sed -i -e 's,lib/ruby,lib64/ruby,' configure"
cpu="`echo $arch | arch2uname`"

[Gerardo Di Iorio]

apply, revision r42035

==============================**==============================**=======
--- package/ruby/ruby/ruby.conf (revision 41957)
+++ package/ruby/ruby/ruby.conf (working copy)
@@ -24,19 +24,20 @@
[ "$SDECFG_STATIC" != 1 ] && var_append confopt ' ' '--enable-shared'
-var_append makeinstopt ' ' 'install-doc'
+# Does this need removing or fixing? we are upto version 1.9 now
set_rubylib() {
- RUBYLIB="$libdir/ruby/1.8"
+ RUBYLIB="$libdir/ruby/1.9"
- for x in $(find $builddir/ruby-1.8.2/ext -type d) ; do
+ for x in $(find $builddir/ruby-1.9.2/ext -type d) ; do
RUBYLIB="${RUBYLIB}:$x"
done
export RUBYLIB
}
hook_add inmake 5 "set_rubylib"
-var_append makeinstopt ' ' 'install-doc'
+# trouble on mips64
+[ $arch != mips64 ] && var_append makeinstopt ' ' 'install-doc'
[[ $libdir = *lib64 ]] && hook_add preconf 5 "sed -i -e
's,lib/ruby,lib64/ruby,' configure"
cpu="`echo $arch | arch2uname`"
------------------------------**----------------------------- If you wish
to unsubscribe from this mailing, send mail to