From 4d0c3d57c87f0a8ba1aa44489888b4fe8debdd79 Mon Sep 17 00:00:00 2001
From: SHIBATA Hiroshi <hsbt@ruby-lang.org>
Date: Mon, 12 Jun 2017 18:27:00 +0900
Subject: [PATCH] Separated standard function to standard_build and
 standard_install.

  * standard_build invoke configure and make. It not invoke `make install`.
  * standard_install invoke only `make install`.
  * Added backword compatibility function for above separation.
  * Added new function for bundled_gems support named standard_install_with_bundled_gems.
---
 bin/ruby-build | 31 ++++++++++++++++++++++---------
 1 file changed, 22 insertions(+), 9 deletions(-)

diff --git a/bin/ruby-build b/bin/ruby-build
index f6d82159..dd528f71 100755
--- a/bin/ruby-build
+++ b/bin/ruby-build
@@ -531,7 +531,7 @@ build_package_warn_unsupported() {
   } >&3
 }
 
-build_package_standard() {
+build_package_standard_build() {
   local package_name="$1"
 
   if [ "${MAKEOPTS+defined}" ]; then
@@ -548,8 +548,6 @@ build_package_standard() {
   local PACKAGE_CONFIGURE_OPTS_ARRAY="${package_var_name}_CONFIGURE_OPTS_ARRAY[@]"
   local PACKAGE_MAKE_OPTS="${package_var_name}_MAKE_OPTS"
   local PACKAGE_MAKE_OPTS_ARRAY="${package_var_name}_MAKE_OPTS_ARRAY[@]"
-  local PACKAGE_MAKE_INSTALL_OPTS="${package_var_name}_MAKE_INSTALL_OPTS"
-  local PACKAGE_MAKE_INSTALL_OPTS_ARRAY="${package_var_name}_MAKE_INSTALL_OPTS_ARRAY[@]"
   local PACKAGE_CFLAGS="${package_var_name}_CFLAGS"
 
   if [ "$package_var_name" = "RUBY" ]; then
@@ -566,20 +564,35 @@ build_package_standard() {
       $CONFIGURE_OPTS ${!PACKAGE_CONFIGURE_OPTS} "${!PACKAGE_CONFIGURE_OPTS_ARRAY}" || return 1
   ) >&4 2>&1
 
-
   { "$MAKE" $MAKE_OPTS ${!PACKAGE_MAKE_OPTS} "${!PACKAGE_MAKE_OPTS_ARRAY}"
   } >&4 2>&1
+}
 
-  if [ "$package_name" == "ruby-trunk" ]; then
-    { "$MAKE" update-gems
-      "$MAKE" extract-gems
-    } >&4 2>&1
-  fi
+build_package_standard_install() {
+  local package_name="$1"
+  local package_var_name="$(capitalize "${package_name%%-*}")"
+
+  local PACKAGE_MAKE_INSTALL_OPTS="${package_var_name}_MAKE_INSTALL_OPTS"
+  local PACKAGE_MAKE_INSTALL_OPTS_ARRAY="${package_var_name}_MAKE_INSTALL_OPTS_ARRAY[@]"
 
   { "$MAKE" install $MAKE_INSTALL_OPTS ${!PACKAGE_MAKE_INSTALL_OPTS} "${!PACKAGE_MAKE_INSTALL_OPTS_ARRAY}"
   } >&4 2>&1
 }
 
+build_package_standard_install_with_bundled_gems() {
+  { "$MAKE" update-gems
+    "$MAKE" extract-gems
+  } >&4 2>&1
+
+  build_package_standard_install
+}
+
+# Backword Compatibility for standard function
+build_package_standard() {
+  build_package_standard_build
+  build_package_standard_install
+}
+
 build_package_autoconf() {
   { autoconf
   } >&4 2>&1