|
 |
f8e4dcc |
diff -ruN ruby-1.8.4.orig/configure.in ruby-1.8.4/configure.in
|
|
|
f8e4dcc |
--- ruby-1.8.4.orig/configure.in 2006-06-07 13:58:03.000000000 +0900
|
|
|
f8e4dcc |
+++ ruby-1.8.4/configure.in 2006-06-07 15:54:36.000000000 +0900
|
|
|
f8e4dcc |
@@ -1476,6 +1476,8 @@
|
|
|
f8e4dcc |
AC_DEFINE_UNQUOTED(RUBY_LIB, "${RUBY_LIB_PATH}")
|
|
|
f8e4dcc |
AC_DEFINE_UNQUOTED(RUBY_SITE_LIB, "${RUBY_SITE_LIB_PATH}")
|
|
|
f8e4dcc |
AC_DEFINE_UNQUOTED(RUBY_SITE_LIB2, "${RUBY_SITE_LIB_PATH2}")
|
|
|
f8e4dcc |
+AC_DEFINE_UNQUOTED(RUBY_DEPRECATED_OLD_SITE_LIB, "${libdir}/site_ruby")
|
|
|
f8e4dcc |
+AC_DEFINE_UNQUOTED(RUBY_DEPRECATED_OLD_SITE_LIB2, "${libdir}/site_ruby/${MAJOR}.${MINOR}")
|
|
|
f8e4dcc |
|
|
|
f8e4dcc |
AC_SUBST(arch)dnl
|
|
|
f8e4dcc |
AC_SUBST(sitearch)dnl
|
|
|
f8e4dcc |
@@ -1506,6 +1508,7 @@
|
|
|
f8e4dcc |
|
|
|
f8e4dcc |
AC_DEFINE_UNQUOTED(RUBY_ARCHLIB, "${RUBY_LIB_PATH2}/${arch}")
|
|
|
f8e4dcc |
AC_DEFINE_UNQUOTED(RUBY_SITE_ARCHLIB, "${RUBY_SITE_LIB_PATH3}/${sitearch}")
|
|
|
f8e4dcc |
+AC_DEFINE_UNQUOTED(RUBY_DEPRECATED_OLD_SITE_ARCHLIB, "${libdir}/site_ruby/${MAJOR}.${MINOR}/${sitearch}")
|
|
|
f8e4dcc |
|
|
|
f8e4dcc |
AC_ARG_WITH(search-path,
|
|
|
f8e4dcc |
[ --with-search-path=DIR specify the additional search path],
|
|
|
f8e4dcc |
diff -ruN ruby-1.8.4.orig/ruby.c ruby-1.8.4/ruby.c
|
|
|
f8e4dcc |
--- ruby-1.8.4.orig/ruby.c 2005-12-12 09:36:52.000000000 +0900
|
|
|
f8e4dcc |
+++ ruby-1.8.4/ruby.c 2006-06-07 15:56:14.000000000 +0900
|
|
|
f8e4dcc |
@@ -297,6 +297,15 @@
|
|
|
f8e4dcc |
#endif
|
|
|
0a1f030 |
incpush(RUBY_RELATIVE(RUBY_SITE_ARCHLIB));
|
|
|
0a1f030 |
incpush(RUBY_RELATIVE(RUBY_SITE_LIB));
|
|
|
7ef51c1 |
+#ifdef RUBY_DEPRECATED_OLD_SITE_LIB2
|
|
|
0a1f030 |
+ incpush(RUBY_RELATIVE(RUBY_DEPRECATED_OLD_SITE_LIB2));
|
|
|
7ef51c1 |
+#endif
|
|
|
f8e4dcc |
+#ifdef RUBY_DEPRECATED_OLD_SITE_ARCHLIB
|
|
|
0a1f030 |
+ incpush(RUBY_RELATIVE(RUBY_DEPRECATED_OLD_SITE_ARCHLIB));
|
|
|
f8e4dcc |
+#endif
|
|
|
f8e4dcc |
+#ifdef RUBY_DEPRECATED_OLD_SITE_LIB
|
|
|
0a1f030 |
+ incpush(RUBY_RELATIVE(RUBY_DEPRECATED_OLD_SITE_LIB));
|
|
|
f8e4dcc |
+#endif
|
|
|
f8e4dcc |
|
|
|
0a1f030 |
incpush(RUBY_RELATIVE(RUBY_LIB));
|
|
|
f8e4dcc |
#ifdef RUBY_THIN_ARCHLIB
|