summaryrefslogtreecommitdiff
path: root/win32/setup.mak
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-04-22 05:33:01 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-04-22 05:33:01 +0000
commit82e65291b1851895fd2d6eedcf7ed53348e5d2a0 (patch)
treecad2b854edad1ce34df0693cf1acc24f200c0f63 /win32/setup.mak
parent4c81b1095373559789c1c0333ba6b780f7e0153e (diff)
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_2@54674 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32/setup.mak')
-rw-r--r--win32/setup.mak3
1 files changed, 3 insertions, 0 deletions
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)