merge revision(s) 53619,53620,53621,53622,53623,53624,53626,53627: [Backport #12287]

	configure.bat: --with-libdir

	* win32/configure.bat: add --with-libdir option for basename of
  libdir.  on Windows it must be placed under exec_prefix always.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@54608 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

4 files changed, 38 insertions, 25 deletions

diff --git a/version.h b/version.h
index be938606af..edbdb74cad 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "2.3.0"
 #define RUBY_RELEASE_DATE "2016-04-16"
-#define RUBY_PATCHLEVEL 82
+#define RUBY_PATCHLEVEL 83
 
 #define RUBY_RELEASE_YEAR 2016
 #define RUBY_RELEASE_MONTH 4
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index 60f2e23b2d..27bc3ddaf6 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -154,8 +154,11 @@ prefix = /usr
 !if !defined(exec_prefix)
 exec_prefix = $(prefix)
 !endif
+!if !defined(libdir_basename)
+libdir_basename = lib
+!endif
 !if !defined(libdir)
-libdir = $(exec_prefix)/lib
+libdir = $(exec_prefix)/$(libdir_basename)
 !endif
 !if !defined(datadir)
 datadir = $(prefix)/share
@@ -812,7 +815,7 @@ s,@datadir@,$${prefix}/share,;t t
 s,@sysconfdir@,$${prefix}/etc,;t t
 s,@sharedstatedir@,/etc,;t t
 s,@localstatedir@,/var,;t t
-s,@libdir@,$${exec_prefix}/lib,;t t
+s,@libdir@,$${exec_prefix}/$(libdir_basename),;t t
 s,@includedir@,$${prefix}/include,;t t
 s,@oldincludedir@,/usr/include,;t t
 s,@infodir@,$${datadir}/info,;t t
diff --git a/win32/configure.bat b/win32/configure.bat
index edf18b7411..98c8af3d65 100755
--- a/win32/configure.bat
+++ b/win32/configure.bat
@@ -38,6 +38,7 @@ if "%1" == "--extout" goto :extout
 if "%1" == "--path" goto :path

 if "%1" == "--with-baseruby" goto :baseruby

 if "%1" == "--with-ntver" goto :ntver

+if "%1" == "--with-libdir" goto :libdir

 if "%1" == "--without-ext" goto :witharg

 if "%1" == "--without-extensions" goto :witharg

 if "%opt:~0,10%" == "--without-" goto :withoutarg

@@ -53,43 +54,43 @@ if "%1" == "--help" goto :help
     echo>>confargs.tmp ,%1\

   )

   shift

-goto :loop

+goto :loop ;

 :srcdir

   echo>> ~tmp~.mak 	"srcdir=%~2" \

   echo>>confargs.tmp --srcdir=%2 \

   shift

   shift

-goto :loop

+goto :loop ;

 :prefix

   echo>> ~tmp~.mak 	"prefix=%~2" \

   echo>>confargs.tmp  %1=%2 \

   shift

   shift

-goto :loop

+goto :loop ;

 :pprefix

   echo>> ~tmp~.mak 	"PROGRAM_PREFIX=%~2" \

   echo>>confargs.tmp  %1=%2 \

   shift

   shift

-goto :loop

+goto :loop ;

 :suffix

   echo>> ~tmp~.mak 	"PROGRAM_SUFFIX=%~2" \

   echo>>confargs.tmp  %1=%2 \

   shift

   shift

-goto :loop

+goto :loop ;

 :installname

   echo>> ~tmp~.mak 	"RUBY_INSTALL_NAME=%~2" \

   echo>>confargs.tmp  %1=%2 \

   shift

   shift

-goto :loop

+goto :loop ;

 :soname

   echo>> ~tmp~.mak 	"RUBY_SO_NAME=%~2" \

   echo>>confargs.tmp  %1=%2 \

   shift

   shift

-goto :loop

+goto :loop ;

 :target

   echo>> ~tmp~.mak 	"%~2" \

   echo>>confargs.tmp --target=%2 \

@@ -100,76 +101,82 @@ goto :loop
 :target3

   shift

   shift

-goto :loop

+goto :loop ;

 :extstatic

   echo>> ~tmp~.mak 	"EXTSTATIC=static" \

   echo>>confargs.tmp %1 \

   shift

-goto :loop

+goto :loop ;

 :enable-rdoc

   echo>> ~tmp~.mak 	"RDOCTARGET=rdoc" \

   echo>>confargs.tmp %1 \

   shift

-goto :loop

+goto :loop ;

 :disable-rdoc

   echo>> ~tmp~.mak 	"RDOCTARGET=nodoc" \

   echo>>confargs.tmp %1 \

   shift

-goto :loop

+goto :loop ;

 :enable-debug-env

   echo>> ~tmp~.mak 	"ENABLE_DEBUG_ENV=yes" \

   echo>>confargs.tmp %1 \

   shift

-goto :loop

+goto :loop ;

 :disable-debug-env

   echo>> ~tmp~.mak 	"ENABLE_DEBUG_ENV=no" \

   echo>>confargs.tmp %1 \

   shift

-goto :loop

+goto :loop ;

 :enable-rubygems

   echo>> ~tmp~.mak 	"USE_RUBYGEMS=YES" \

   echo>>confargs.tmp %1 \

   shift

-goto :loop

+goto :loop ;

 :disable-rubygems

   echo>> ~tmp~.mak 	"USE_RUBYGEMS=NO" \

   echo>>confargs.tmp %1 \

   shift

-goto :loop

+goto :loop ;

 :ntver

   echo>> ~tmp~.mak 	"NTVER=%~2" \

   echo>>confargs.tmp  %1=%2 \

   shift

   shift

-goto :loop

+goto :loop ;

 :extout

   echo>> ~tmp~.mak 	"EXTOUT=%~2" \

   echo>>confargs.tmp  %1=%2 \

   shift

   shift

-goto :loop

+goto :loop ;

 :path

   echo>>pathlist.tmp %~2;\

   echo>>confargs.tmp  %1=%2 \

   shift

   shift

-goto :loop

+goto :loop ;

 :baseruby

   echo>> ~tmp~.mak 	"BASERUBY=%~2" \

   echo>>confargs.tmp  %1=%2 \

   shift

   shift

-goto :loop

+goto :loop ;

+:libdir

+  echo>> ~tmp~.mak 	"libdir_basename=%~2" \

+  echo>>confargs.tmp  %1=%2 \

+  shift

+  shift

+goto :loop ;

 :witharg

   echo>>confargs.tmp  %1=%2\

   set witharg=1

   shift

   shift

-goto :loop

+goto :loop ;

 :withoutarg

   echo>>confargs.tmp  %1 \

   shift

-goto :loop

+goto :loop ;

 :help

   echo Configuration:

   echo   --help                  display this help

@@ -191,7 +198,7 @@ goto :exit
 :end

 echo>> ~tmp~.mak 	WIN32DIR=$(@D:\=/)

 echo.>>confargs.tmp

-echo>confargs.c #define $ $$ 

+echo>confargs.c #define $ $$ //

 echo>>confargs.c !ifndef CONFIGURE_ARGS

 type>>confargs.c confargs.tmp

 echo>>confargs.c configure_args = CONFIGURE_ARGS

diff --git a/win32/setup.mak b/win32/setup.mak
index f00418e864..efc2d8d0da 100644
--- a/win32/setup.mak
+++ b/win32/setup.mak
@@ -44,6 +44,9 @@ ia64-mswin64: -prologue64- -ia64- -epilogue-
 MAKE = nmake
 srcdir = $(srcdir:\=/)
 prefix = $(prefix:\=/)
+!if defined(libdir_basename)
+libdir_basename = $(libdir_basename)
+!endif
 EXTSTATIC = $(EXTSTATIC)
 !if defined(RDOCTARGET)
 RDOCTARGET = $(RDOCTARGET)