From ef5b2914909c2ab47038a5a85c8e022a8b6cfb30 Mon Sep 17 00:00:00 2001
From: nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 15 Apr 2016 16:22:03 +0000
Subject: 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
---
 win32/configure.bat | 51 +++++++++++++++++++++++++++++----------------------
 1 file changed, 29 insertions(+), 22 deletions(-)

(limited to 'win32/configure.bat')

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
-- 
cgit v1.2.3