		`@@ -39,7 +39,7 @@`
		`index 0e371e2..d4f1dcb 100644`
		`--- a/configure.in`
		`+++ b/configure.in`
		`- @@ -4536,6 +4536,13 @@ AC_SUBST(rubyarchhdrdir)dnl`
		`+ @@ -4563,6 +4563,13 @@ AC_SUBST(rubyarchhdrdir)dnl`
		`AC_SUBST(sitearchhdrdir)dnl`
		`AC_SUBST(vendorarchhdrdir)dnl`

		`@@ -14,7 +14,7 @@`
		`index db37cd6..ce8d149 100644`
		`--- a/configure.in`
		`+++ b/configure.in`
		`- @@ -4390,7 +4390,8 @@ AS_CASE(["$ruby_version_dir_name"],`
		`+ @@ -4417,7 +4417,8 @@ AS_CASE(["$ruby_version_dir_name"],`
		`ruby_version_dir=/'${ruby_version_dir_name}'`

		`if test -z "${ruby_version_dir_name}"; then`

		`@@ -11,7 +11,7 @@`
		`index 553d4d0..03a4152 100644`
		`--- a/configure.in`
		`+++ b/configure.in`
		`- @@ -4454,6 +4454,8 @@ AC_SUBST(vendorarchdir)dnl`
		`+ @@ -4481,6 +4481,8 @@ AC_SUBST(vendorarchdir)dnl`
		AC_SUBST(CONFIGURE, "`echo $0 \| sed 's\|.*/\|\|'`")dnl
		AC_SUBST(configure_args, "`echo "${ac_configure_args}" \| sed 's/\\$/$$/g'`")dnl

		`@@ -15,7 +15,7 @@`
		`index 03a4152..0e371e2 100644`
		`--- a/configure.in`
		`+++ b/configure.in`
		`- @@ -4426,6 +4426,10 @@ AC_ARG_WITH(vendorarchdir,`
		`+ @@ -4453,6 +4453,10 @@ AC_ARG_WITH(vendorarchdir,`
		`[vendorarchdir=$withval],`
		`[vendorarchdir=${multiarch+'${rubysitearchprefix}/vendor_ruby'${ruby_version_dir}}${multiarch-'${vendorlibdir}/${sitearch}'}])`

		`@@ -26,7 +26,7 @@`
		`if test "${LOAD_RELATIVE+set}"; then`
		`AC_DEFINE_UNQUOTED(LOAD_RELATIVE, $LOAD_RELATIVE)`
		`RUBY_EXEC_PREFIX=''`
		`- @@ -4450,6 +4454,7 @@ AC_SUBST(sitearchdir)dnl`
		`+ @@ -4477,6 +4481,7 @@ AC_SUBST(sitearchdir)dnl`
		`AC_SUBST(vendordir)dnl`
		`AC_SUBST(vendorlibdir)dnl`
		`AC_SUBST(vendorarchdir)dnl`

		`@@ -20,7 +20,7 @@`
		`index db37cd6..6e73fae 100644`
		`--- a/configure.in`
		`+++ b/configure.in`
		`- @@ -4341,9 +4341,6 @@ AS_CASE(["$target_os"],`
		`+ @@ -4368,9 +4368,6 @@ AS_CASE(["$target_os"],`
		`rubyw_install_name='$(RUBYW_INSTALL_NAME)'`
		`])`

		`@@ -30,7 +30,7 @@`
		`rubyarchprefix=${multiarch+'${archlibdir}/${RUBY_BASE_NAME}'}${multiarch-'${rubylibprefix}/${arch}'}`
		`AC_ARG_WITH(rubyarchprefix,`
		`AS_HELP_STRING([--with-rubyarchprefix=DIR],`
		`- @@ -4366,56 +4363,62 @@ AC_ARG_WITH(ridir,`
		`+ @@ -4393,56 +4390,62 @@ AC_ARG_WITH(ridir,`
		`AC_SUBST(ridir)`
		`AC_SUBST(RI_BASE_NAME)`

		`@@ -120,7 +120,7 @@`

		`if test "${LOAD_RELATIVE+set}"; then`
		`AC_DEFINE_UNQUOTED(LOAD_RELATIVE, $LOAD_RELATIVE)`
		`- @@ -4432,6 +4435,7 @@ AC_SUBST(sitearchincludedir)dnl`
		`+ @@ -4459,6 +4462,7 @@ AC_SUBST(sitearchincludedir)dnl`
		`AC_SUBST(arch)dnl`
		`AC_SUBST(sitearch)dnl`
		`AC_SUBST(ruby_version)dnl`
		`@@ -245,7 +245,7 @@`
		`index 0428bea..b6e090e 100644`
		`--- a/test/rubygems/test_gem.rb`
		`+++ b/test/rubygems/test_gem.rb`
		`- @@ -1101,7 +1101,8 @@ def test_self_use_paths`
		`+ @@ -1124,7 +1124,8 @@ def test_self_use_paths`

		`def test_self_user_dir`
		`parts = [@userhome, '.gem', Gem.ruby_engine]`
		`@@ -255,7 +255,7 @@`

		`assert_equal File.join(parts), Gem.user_dir`
		`end`
		`- @@ -1228,7 +1229,7 @@ def test_self_user_home_user_drive_and_path`
		`+ @@ -1251,7 +1252,7 @@ def test_self_user_home_user_drive_and_path`
		`def test_self_vendor_dir`
		`expected =`
		`File.join RbConfig::CONFIG['vendordir'], 'gems',`