nobu	2013-12-14 16:26:52 +0900 (Sat, 14 Dec 2013)

  New Revision: 44205

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=44205

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

  Modified files:
    trunk/ChangeLog
    trunk/configure.in
Index: configure.in
===================================================================
--- configure.in	(revision 44204)
+++ configure.in	(revision 44205)
@@ -2940,6 +2940,15 @@ else https://github.com/ruby/ruby/blob/trunk/configure.in#L2940
 fi
 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
     RUBY_EXEC_PREFIX="$exec_prefix"
 elif test x"$prefix" != xNONE; then
@@ -2948,7 +2957,7 @@ else https://github.com/ruby/ruby/blob/trunk/configure.in#L2957
     RUBY_EXEC_PREFIX=$ac_default_prefix
 fi
 pat=`echo "${RUBY_EXEC_PREFIX}" | tr -c '\012' .`'\(.*\)'
-for var in bindir libdir; do
+for var in bindir libdir rubylibprefix; do
     eval val='"$'$var'"'
     AS_CASE(["$val"], ["${RUBY_EXEC_PREFIX}"*], [val='${exec_prefix}'"`expr \"$val\" : \"$pat\"`"])
     eval $var='"$val"'
@@ -3600,14 +3609,6 @@ AS_CASE(["$target_os"], https://github.com/ruby/ruby/blob/trunk/configure.in#L3609
     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}'
 rubyarchdir=${multiarch+'${rubyarchprefix}/${ruby_version}'}${multiarch-'${rubylibdir}/${arch}'}
 
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 44204)
+++ ChangeLog	(revision 44205)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Sat Dec 14 16:26:46 2013  Nobuyoshi Nakada  <nobu@r...>
+
+	* 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@r...>
 
 	* lib/logger.rb (lock_shift_log): no need to rotate the log file

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/