aboutsummaryrefslogtreecommitdiffstats
path: root/win32/Makefile.sub
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-01-22 14:28:31 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-01-22 14:28:31 +0000
commit7169e588a78f7604d6c9dfc5026ecf8942822105 (patch)
tree33b44855e5bf2f2a75bc3dbaeb416b1cfc98bb7f /win32/Makefile.sub
parent36ae5cd232a1ab85eccce1e328fff15dc968eda7 (diff)
downloadruby-7169e588a78f7604d6c9dfc5026ecf8942822105.tar.gz
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/trunk@53619 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32/Makefile.sub')
-rw-r--r--win32/Makefile.sub7
1 files changed, 5 insertions, 2 deletions
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index 38933ae9d0..47b55bcdb1 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -158,8 +158,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
@@ -813,7 +816,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