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: unexpand exec_prefix in rubylibprefix

Browse source 
* configure.in (rubylibprefix): replace exec_prefix as well as
  bindir and libdir.  a patch by kimuraw (Wataru Kimura) at
  [ruby-dev:47852].  [Bug #9160]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44205 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2013-12-14 07:26:52 +00:00
parent c1ffaef8c9
commit 36e9f58ddf
2 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Sat Dec 14 16:26:46 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in (rubylibprefix): replace exec_prefix as well as
bindir and libdir. a patch by kimuraw (Wataru Kimura) at
[ruby-dev:47852]. [Bug #9160]
Sat Dec 14 14:42:53 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> Sat Dec 14 14:42:53 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/logger.rb (lock_shift_log): no need to rotate the log file * lib/logger.rb (lock_shift_log): no need to rotate the log file

19
configure.in
View file

@ -2940,6 +2940,15 @@ else
fi fi
AC_SUBST(setup) AC_SUBST(setup)
rubylibprefix='${libdir}/${RUBY_BASE_NAME}'
AC_ARG_WITH(rubylibprefix,
AS_HELP_STRING([--with-rubylibprefix=DIR], [prefix for ruby libraries [[LIBDIR/RUBY_BASE_NAME]]]),
[if test "x$withval" = xno; then
AC_MSG_ERROR([No ruby, No libprefix])
fi
rubylibprefix="$withval"])
AC_SUBST(rubylibprefix)
if test x"${exec_prefix}" != xNONE; then if test x"${exec_prefix}" != xNONE; then
RUBY_EXEC_PREFIX="$exec_prefix" RUBY_EXEC_PREFIX="$exec_prefix"
elif test x"$prefix" != xNONE; then elif test x"$prefix" != xNONE; then
@ -2948,7 +2957,7 @@ else
RUBY_EXEC_PREFIX=$ac_default_prefix RUBY_EXEC_PREFIX=$ac_default_prefix
fi fi
pat=`echo "${RUBY_EXEC_PREFIX}" | tr -c '\012' .`'\(.*\)' pat=`echo "${RUBY_EXEC_PREFIX}" | tr -c '\012' .`'\(.*\)'
for var in bindir libdir; do for var in bindir libdir rubylibprefix; do
eval val='"$'$var'"' eval val='"$'$var'"'
AS_CASE(["$val"], ["${RUBY_EXEC_PREFIX}"*], [val='${exec_prefix}'"`expr \"$val\" : \"$pat\"`"]) AS_CASE(["$val"], ["${RUBY_EXEC_PREFIX}"*], [val='${exec_prefix}'"`expr \"$val\" : \"$pat\"`"])
eval $var='"$val"' eval $var='"$val"'
@ -3600,14 +3609,6 @@ AS_CASE(["$target_os"],
rubyw_install_name='$(RUBYW_INSTALL_NAME)' rubyw_install_name='$(RUBYW_INSTALL_NAME)'
]) ])
rubylibprefix='${libdir}/${RUBY_BASE_NAME}'
AC_ARG_WITH(rubylibprefix,
AS_HELP_STRING([--with-rubylibprefix=DIR], [prefix for ruby libraries [[LIBDIR/RUBY_BASE_NAME]]]),
[if test "x$withval" = xno; then
AC_MSG_ERROR([No ruby, No libprefix])
fi
rubylibprefix="$withval"])
AC_SUBST(rubylibprefix)
rubylibdir='${rubylibprefix}/${ruby_version}' rubylibdir='${rubylibprefix}/${ruby_version}'
rubyarchdir=${multiarch+'${rubyarchprefix}/${ruby_version}'}${multiarch-'${rubylibdir}/${arch}'} rubyarchdir=${multiarch+'${rubyarchprefix}/${ruby_version}'}${multiarch-'${rubylibdir}/${arch}'}