nobu	2016-01-22 23:28:31 +0900 (Fri, 22 Jan 2016)

  New Revision: 53619

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=53619

  Log:
    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.

  Modified files:
    trunk/win32/Makefile.sub
    trunk/win32/configure.bat
    trunk/win32/setup.mak
Index: win32/Makefile.sub
===================================================================
--- win32/Makefile.sub	(revision 53618)
+++ win32/Makefile.sub	(revision 53619)
@@ -158,8 +158,11 @@ prefix = /usr https://github.com/ruby/ruby/blob/trunk/win32/Makefile.sub#L158
 !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
@@ -813,7 +816,7 @@ s,@datadir@,$${prefix}/share,;t t https://github.com/ruby/ruby/blob/trunk/win32/Makefile.sub#L816
 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
Index: win32/setup.mak
===================================================================
--- win32/setup.mak	(revision 53618)
+++ win32/setup.mak	(revision 53619)
@@ -44,6 +44,9 @@ ia64-mswin64: -prologue64- -ia64- -epilo https://github.com/ruby/ruby/blob/trunk/win32/setup.mak#L44
 MAKE = nmake
 srcdir = $(srcdir:\=/)
 prefix = $(prefix:\=/)
+!if defined(libdir_basename)
+libdir_basename = $(libdir_basename)
+!endif
 EXTSTATIC = $(EXTSTATIC)
 !if defined(RDOCTARGET)
 RDOCTARGET = $(RDOCTARGET)
Index: win32/configure.bat
===================================================================
--- win32/configure.bat	(revision 53618)
+++ win32/configure.bat	(revision 53619)
@@ -38,6 +38,7 @@ if "%1" == "--extout" goto :extout https://github.com/ruby/ruby/blob/trunk/win32/configure.bat#L38
 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
@@ -159,6 +160,12 @@ goto :loop https://github.com/ruby/ruby/blob/trunk/win32/configure.bat#L160
   echo>>confargs.tmp  %1=%2 \
   shift
   shift
+goto :loop
+:libdir
+  echo>> ~tmp~.mak 	"libdir_basename=%~2" \
+  echo>>confargs.tmp  %1=%2 \
+  shift
+  shift
 goto :loop
 :witharg
   echo>>confargs.tmp  %1=%2\

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