kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* configure.in: Fix $LOAD_PATH. Properly expand vendor_ruby

Browse source 
directories; submitted by Takahiro Kambe <taca at
  back-street.net> in [ruby-dev:35099].


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@17161 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
knu 2008-06-14 13:19:03 +00:00
parent 232449ed55
commit 5e261f7d44
2 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Sat Jun 14 22:16:09 2008 Akinori MUSHA <knu@iDaemons.org>
* configure.in: Fix $LOAD_PATH. Properly expand vendor_ruby
directories; submitted by Takahiro Kambe <taca at
back-street.net> in [ruby-dev:35099].
Sat Jun 14 16:55:46 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> Sat Jun 14 16:55:46 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* file.c (file_expand_path): no need to expand root path which has no * file.c (file_expand_path): no need to expand root path which has no

8
configure.in
View file

@ -1727,14 +1727,14 @@ AC_ARG_WITH(vendordir,
VENDOR_DIR=`eval echo \\"${vendordir}\\"` VENDOR_DIR=`eval echo \\"${vendordir}\\"`
case "$target_os" in case "$target_os" in
cygwin*|mingw*|*djgpp*|os2-emx*) cygwin*|mingw*|*djgpp*|os2-emx*)
RUBY_VENDOR_LIB_PATH="`expr "$VENDOR_DIR" : "$prefix\(/.*\)"`" || RUBY_VENDOR_LIB_PATH="`eval echo "$VENDOR_DIR" | sed 's|^NONE/|/|;s|^'"$prefix"'/|/|'`"
RUBY_VENDOR_LIB_PATH="$VENDOR_DIR";; ;;
*) *)
RUBY_VENDOR_LIB_PATH="$VENDOR_DIR";; RUBY_VENDOR_LIB_PATH="`eval echo \\"$VENDOR_DIR\\" | sed 's|^NONE/|'"$prefix"'/|'`"
;;
esac esac
RUBY_VENDOR_LIB_PATH2="${RUBY_VENDOR_LIB_PATH}/${MAJOR}.${MINOR}" RUBY_VENDOR_LIB_PATH2="${RUBY_VENDOR_LIB_PATH}/${MAJOR}.${MINOR}"
AC_DEFINE_UNQUOTED(RUBY_LIB, "${RUBY_LIB_PATH}")
AC_DEFINE_UNQUOTED(RUBY_VENDOR_LIB, "${RUBY_VENDOR_LIB_PATH}") AC_DEFINE_UNQUOTED(RUBY_VENDOR_LIB, "${RUBY_VENDOR_LIB_PATH}")
AC_DEFINE_UNQUOTED(RUBY_VENDOR_LIB2, "${RUBY_VENDOR_LIB_PATH2}") AC_DEFINE_UNQUOTED(RUBY_VENDOR_LIB2, "${RUBY_VENDOR_LIB_PATH2}")