From 81f02142b885f2dbe0b19f77b18a7d5736e1085b Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 26 Apr 2018 12:36:27 +0000
Subject: [PATCH] win32/Makefile.sub: LIBDIR_BASENAME

* mjit.c (init_header_filename): support LIBDIR_BASENAME.

* win32/Makefile.sub (config.h): ditto.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@63264 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 mjit.c             | 13 ++++++++++---
 win32/Makefile.sub |  3 +++
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/mjit.c b/mjit.c
index 8f065b4cbf..02266de2d7 100644
--- a/mjit.c
+++ b/mjit.c
@@ -1176,13 +1176,20 @@ init_header_filename(void)
     const size_t header_name_len = sizeof(header_name) - 1;
     char *p;
 #ifdef _WIN32
+    static const char libdirname[] = "/"
+# ifdef LIBDIR_BASENAME
+	LIBDIR_BASENAME
+# else
+	"lib"
+# endif
+	;
     static const char libpathflag[] =
 # ifdef _MSC_VER
         "-LIBPATH:"
 # else
         "-L"
 # endif
-            ;
+	;
     const size_t libpathflag_len = sizeof(libpathflag) - 1;
 #endif
 
@@ -1210,9 +1217,9 @@ init_header_filename(void)
     p = append_str2(p, basedir, baselen);
     *p = '\0';
 
-    libruby_installed = xmalloc(libpathflag_len + baselen + rb_strlen_lit("/lib") + 1);
+    libruby_installed = xmalloc(libpathflag_len + baselen + sizeof(libdirname));
     p = append_str2(libruby_installed, libruby_build, p - libruby_build);
-    p = append_lit(p, "/lib");
+    p = append_str(p, libdirname);
     *p = '\0';
 #endif
 }
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index e4d3d48a61..bd54f1debe 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -834,6 +834,9 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/win32/Makefile.sub $(win_srcdir)/Makefile.sub
 #define DEFAULT_KCODE KCODE_NONE
 #define LOAD_RELATIVE 1
 #define DLEXT ".so"
+!if "$(libdir_basename)" != "lib"
+#define LIBDIR_BASENAME "$(libdir_basename)"
+!endif
 !if "$(EXTSTATIC)" == "static"
 #define EXTSTATIC 1
 !endif