nobu	2013-02-21 09:51:11 +0900 (Thu, 21 Feb 2013)

  New Revision: 39345

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

  Log:
    configure.in: libdir_basename for -rpath and -install_name
    
    * configure.in (libdir_basename): also -rpath and -install_name flags
      are affected when libruby directory changes.  [Bug #7874]

  Modified files:
    trunk/ChangeLog
    trunk/Makefile.in
    trunk/configure.in

Index: configure.in
===================================================================
--- configure.in	(revision 39344)
+++ configure.in	(revision 39345)
@@ -2699,6 +2699,7 @@ AS_CASE("$enable_shared", [yes], [ https://github.com/ruby/ruby/blob/trunk/configure.in#L2699
     AS_CASE(["$libdir"], ['${exec_prefix}/'*], [libdir_basename=`basename "$libdir"`])
   fi
   AC_DEFINE_UNQUOTED(LIBDIR_BASENAME, ["${libdir_basename}"])
+  AC_SUBST(libdir_basename)
 
   AS_CASE(["$target_os"],
     [freebsd*|dragonfly*], [],
@@ -2719,7 +2720,7 @@ AS_CASE("$enable_shared", [yes], [ https://github.com/ruby/ruby/blob/trunk/configure.in#L2720
 	LIBRUBY_DLDFLAGS='-Wl,-soname,lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR)'" $LDFLAGS_OPTDIR"
 	LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR) lib$(RUBY_SO_NAME).so'
 	if test "$load_relative" = yes; then
-	    LIBRUBY_RPATHFLAGS="'-Wl,-rpath,\$\${ORIGIN}/../${libdir_basename}'"
+	    LIBRUBY_RPATHFLAGS="'-Wl,-rpath,\$\${ORIGIN}/../\${libdir_basename}'"
 	    LIBRUBY_RELATIVE=yes
 	fi
 	],
@@ -2776,7 +2777,7 @@ AS_CASE("$enable_shared", [yes], [ https://github.com/ruby/ruby/blob/trunk/configure.in#L2777
 	RUBY_SO_NAME="$RUBY_SO_NAME"'.$(MAJOR).$(MINOR).$(TEENY)'
 	LIBRUBY_LDSHARED='$(CC) -dynamiclib'
 	if test "$load_relative" = yes; then
-	    libprefix="@executable_path/../${libdir_basename}"
+	    libprefix='@executable_path/../${libdir_basename}'
 	    LIBRUBY_RELATIVE=yes
 	fi
 	LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS "'-install_name '${libprefix}'/$(LIBRUBY_SO)'
@@ -3236,6 +3237,9 @@ archlibdir='${libdir}/${arch}' https://github.com/ruby/ruby/blob/trunk/configure.in#L3237
 sitearchlibdir='${libdir}/${sitearch}'
 archincludedir='${includedir}/${arch}'
 sitearchincludedir='${includedir}/${sitearch}'
+if test ${libdir_basename+set}; then
+    libdir_basename="${libdir_basename}"${multiarch+'/${arch}'}
+fi
 
 shvar_to_cpp() {
     local var="$1" val="$2"
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 39344)
+++ ChangeLog	(revision 39345)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Thu Feb 21 09:51:05 2013  Nobuyoshi Nakada  <nobu@r...>
+
+	* configure.in (libdir_basename): also -rpath and -install_name flags
+	  are affected when libruby directory changes.  [Bug #7874]
+
 Wed Feb 20 19:27:02 2013  Nobuyoshi Nakada  <nobu@r...>
 
 	* include/ruby/ruby.h (HAVE_RB_SCAN_ARGS_OPTIONAL_HASH): for
Index: Makefile.in
===================================================================
--- Makefile.in	(revision 39344)
+++ Makefile.in	(revision 39345)
@@ -34,6 +34,7 @@ exec_prefix = @exec_prefix@ https://github.com/ruby/ruby/blob/trunk/Makefile.in#L34
 bindir = @bindir@
 sbindir = @sbindir@
 libdir = @libdir@
+libdir_basename = @libdir_basename@
 libexecdir = @libexecdir@
 datarootdir = @datarootdir@
 datadir = @datadir@

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