Skip to content

Commit

Permalink
* configure.in: Fix $LOAD_PATH. Properly expand vendor_ruby
Browse files Browse the repository at this point in the history
  directories; submitted by Takahiro Kambe <taca at
  back-street.net> in [ruby-dev:35099].


git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8_7@17183 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information
knu committed Jun 15, 2008
1 parent 3292179 commit e00f858
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 8 deletions.
6 changes: 6 additions & 0 deletions ChangeLog
@@ -1,3 +1,9 @@
Sun Jun 15 19:27:40 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].

Mon Jun 9 17:56:30 2008 Akinori MUSHA <knu@iDaemons.org>

* lib/set.rb (Set#delete_if): Call to_a.
Expand Down
8 changes: 4 additions & 4 deletions configure.in
Expand Up @@ -1717,14 +1717,14 @@ AC_ARG_WITH(vendordir,
VENDOR_DIR=`eval echo \\"${vendordir}\\"`
case "$target_os" in
cygwin*|mingw*|*djgpp*|os2-emx*)
RUBY_VENDOR_LIB_PATH="`expr "$VENDOR_DIR" : "$prefix\(/.*\)"`" ||
RUBY_VENDOR_LIB_PATH="$VENDOR_DIR";;
RUBY_VENDOR_LIB_PATH="`eval echo "$VENDOR_DIR" | sed 's|^NONE/|/|;s|^'"$prefix"'/|/|'`"
;;
*)
RUBY_VENDOR_LIB_PATH="$VENDOR_DIR";;
RUBY_VENDOR_LIB_PATH="`eval echo \\"$VENDOR_DIR\\" | sed 's|^NONE/|'"$prefix"'/|'`"
;;
esac
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_LIB2, "${RUBY_VENDOR_LIB_PATH2}")

Expand Down
8 changes: 4 additions & 4 deletions version.h
@@ -1,15 +1,15 @@
#define RUBY_VERSION "1.8.7"
#define RUBY_RELEASE_DATE "2008-06-09"
#define RUBY_RELEASE_DATE "2008-06-15"
#define RUBY_VERSION_CODE 187
#define RUBY_RELEASE_CODE 20080609
#define RUBY_PATCHLEVEL 17
#define RUBY_RELEASE_CODE 20080615
#define RUBY_PATCHLEVEL 18

#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8
#define RUBY_VERSION_TEENY 7
#define RUBY_RELEASE_YEAR 2008
#define RUBY_RELEASE_MONTH 6
#define RUBY_RELEASE_DAY 9
#define RUBY_RELEASE_DAY 15

#ifdef RUBY_EXTERN
RUBY_EXTERN const char ruby_version[];
Expand Down

0 comments on commit e00f858

Please sign in to comment.