1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* configure.in (SITE_DIR, VENDOR_DIR),

Browse Source 
version.c (ruby_initial_load_paths): exclude directories that
  are configured without them from $LOAD_PATH. [ruby-core:33267]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29877 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2010-11-22 21:30:54 +00:00
parent a97c07fb2e
commit 66d4bdd114
3 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,4 +1,8 @@
Tue Nov 23 06:30:18 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> Tue Nov 23 06:30:51 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in (SITE_DIR, VENDOR_DIR),
version.c (ruby_initial_load_paths): exclude directories that
are configured without them from $LOAD_PATH. [ruby-core:33267]
* configure.in (rubylibprefix): No ruby, No libprefix. * configure.in (rubylibprefix): No ruby, No libprefix.

12
configure.in
View File

@ -2713,8 +2713,16 @@ else
fi fi
AC_DEFINE_UNQUOTED(RUBY_EXEC_PREFIX, "${RUBY_EXEC_PREFIX}") AC_DEFINE_UNQUOTED(RUBY_EXEC_PREFIX, "${RUBY_EXEC_PREFIX}")
AC_DEFINE_UNQUOTED(RUBY_LIB_PREFIX, ${RUBY_LIB_PREFIX}) AC_DEFINE_UNQUOTED(RUBY_LIB_PREFIX, ${RUBY_LIB_PREFIX})
AC_DEFINE_UNQUOTED(RUBY_SITE_LIB, ${RUBY_SITE_LIB_PATH}) if test "x$SITE_DIR" = xno; then
AC_DEFINE_UNQUOTED(RUBY_VENDOR_LIB, ${RUBY_VENDOR_LIB_PATH}) AC_DEFINE(NO_RUBY_SITE_LIB)
else
AC_DEFINE_UNQUOTED(RUBY_SITE_LIB, ${RUBY_SITE_LIB_PATH})
fi
if test "x$VENDOR_DIR" = xno; then
AC_DEFINE(NO_RUBY_VENDOR_LIB)
else
AC_DEFINE_UNQUOTED(RUBY_VENDOR_LIB, ${RUBY_VENDOR_LIB_PATH})
fi
AC_SUBST(arch)dnl AC_SUBST(arch)dnl
AC_SUBST(sitearch)dnl AC_SUBST(sitearch)dnl

4
version.c
View File

@ -69,19 +69,23 @@ const char ruby_initial_load_paths[] =
#ifdef RUBY_SEARCH_PATH #ifdef RUBY_SEARCH_PATH
RUBY_SEARCH_PATH "\0" RUBY_SEARCH_PATH "\0"
#endif #endif
#ifndef NO_RUBY_SITE_LIB
RUBY_SITE_LIB2 "\0" RUBY_SITE_LIB2 "\0"
#ifdef RUBY_SITE_THIN_ARCHLIB #ifdef RUBY_SITE_THIN_ARCHLIB
RUBY_SITE_THIN_ARCHLIB "\0" RUBY_SITE_THIN_ARCHLIB "\0"
#endif #endif
RUBY_SITE_ARCHLIB "\0" RUBY_SITE_ARCHLIB "\0"
RUBY_SITE_LIB "\0" RUBY_SITE_LIB "\0"
#endif
#ifndef NO_RUBY_VENDOR_LIB
RUBY_VENDOR_LIB2 "\0" RUBY_VENDOR_LIB2 "\0"
#ifdef RUBY_VENDOR_THIN_ARCHLIB #ifdef RUBY_VENDOR_THIN_ARCHLIB
RUBY_VENDOR_THIN_ARCHLIB "\0" RUBY_VENDOR_THIN_ARCHLIB "\0"
#endif #endif
RUBY_VENDOR_ARCHLIB "\0" RUBY_VENDOR_ARCHLIB "\0"
RUBY_VENDOR_LIB "\0" RUBY_VENDOR_LIB "\0"
#endif
RUBY_LIB "\0" RUBY_LIB "\0"
#ifdef RUBY_THIN_ARCHLIB #ifdef RUBY_THIN_ARCHLIB