diff options
| author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-04-15 16:22:03 +0000 |
|---|---|---|
| committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-04-15 16:22:03 +0000 |
| commit | ef5b2914909c2ab47038a5a85c8e022a8b6cfb30 (patch) | |
| tree | 5bb315a8f4130befa59140ed3c7cdbe41d16a3d3 /win32/Makefile.sub | |
| parent | 260d1ac2ca8711971c48e14bd535aeeb20f6ed1d (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_3@54608 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32/Makefile.sub')
| -rw-r--r-- | win32/Makefile.sub | 7 |
1 files changed, 5 insertions, 2 deletions
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 |