Merge branch 'master' into v2.1

2 files changed, 40 insertions, 19 deletions

diff --git a/src/Makefile b/src/Makefile
index 94bc0fd2..441feffb 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -185,9 +185,10 @@ TARGET_LD= $(CROSS)$(CC)
 TARGET_AR= $(CROSS)ar rcus
 TARGET_STRIP= $(CROSS)strip
 
+TARGET_LIBPATH= $(or $(PREFIX),/usr/local)/$(or $(MULTILIB),lib)
 TARGET_SONAME= libluajit-$(ABIVER).so.$(MAJVER)
 TARGET_DYLIBNAME= libluajit-$(ABIVER).$(MAJVER).dylib
-TARGET_DYLIBPATH= $(or $(PREFIX),/usr/local)/lib/$(TARGET_DYLIBNAME)
+TARGET_DYLIBPATH= $(TARGET_LIBPATH)/$(TARGET_DYLIBNAME)
 TARGET_DLLNAME= lua$(NODOTABIVER).dll
 TARGET_XSHLDFLAGS= -shared -fPIC -Wl,-soname,$(TARGET_SONAME)
 TARGET_DYNXLDOPTS=
@@ -246,12 +247,18 @@ TARGET_ARCH+= $(patsubst %,-DLUAJIT_TARGET=LUAJIT_ARCH_%,$(TARGET_LJARCH))
 
 ifneq (,$(PREFIX))
 ifneq (/usr/local,$(PREFIX))
-  TARGET_XCFLAGS+= -DLUA_XROOT=\"$(PREFIX)/\"
+  TARGET_XCFLAGS+= -DLUA_ROOT=\"$(PREFIX)\"
   ifneq (/usr,$(PREFIX))
-    TARGET_DYNXLDOPTS= -Wl,-rpath,$(PREFIX)/lib
+    TARGET_DYNXLDOPTS= -Wl,-rpath,$(TARGET_LIBPATH)
   endif
 endif
 endif
+ifneq (,$(MULTILIB))
+  TARGET_XCFLAGS+= -DLUA_MULTILIB=\"$(MULTILIB)\"
+endif
+ifneq (,$(LMULTILIB))
+  TARGET_XCFLAGS+= -DLUA_LMULTILIB=\"$(LMULTILIB)\"
+endif
 
 ##############################################################################
 # System detection.
diff --git a/src/luaconf.h b/src/luaconf.h
index d283233d..d5f2d0f5 100644
--- a/src/luaconf.h
+++ b/src/luaconf.h
@@ -23,26 +23,40 @@
   ".\\?.dll;" LUA_CDIR"?.dll;" LUA_CDIR"loadall.dll"
 #else
 /*
-** Note to distribution maintainers: do NOT patch the following line!
+** Note to distribution maintainers: do NOT patch the following lines!
 ** Please read ../doc/install.html#distro and pass PREFIX=/usr instead.
 */
-#define LUA_ROOT        "/usr/local/"
-#define LUA_LDIR        LUA_ROOT "share/lua/5.1/"
-#define LUA_CDIR        LUA_ROOT "lib/lua/5.1/"
-#ifdef LUA_XROOT
-#define LUA_JDIR        LUA_XROOT "share/luajit-2.1.0-alpha/"
-#define LUA_XPATH \
-  ";" LUA_XROOT "share/lua/5.1/?.lua;" LUA_XROOT "share/lua/5.1/?/init.lua"
-#define LUA_XCPATH      LUA_XROOT "lib/lua/5.1/?.so;"
+#ifndef LUA_MULTILIB
+#define LUA_MULTILIB    "lib"
+#endif
+#ifndef LUA_LMULTILIB
+#define LUA_LMULTILIB   "lib"
+#endif
+#define LUA_LROOT       "/usr/local"
+#define LUA_LUADIR      "/lua/5.1/"
+#define LUA_LJDIR       "/luajit-2.1.0-alpha/"
+
+#ifdef LUA_ROOT
+#define LUA_JROOT       LUA_ROOT
+#define LUA_RLDIR       LUA_ROOT "/share" LUA_LUADIR
+#define LUA_RCDIR       LUA_ROOT "/" LUA_MULTILIB LUA_LUADIR
+#define LUA_RLPATH      ";" LUA_RLDIR "?.lua;" LUA_RLDIR "?/init.lua"
+#define LUA_RCPATH      ";" LUA_RCDIR "?.so"
 #else
-#define LUA_JDIR        LUA_ROOT "share/luajit-2.1.0-alpha/"
-#define LUA_XPATH
-#define LUA_XCPATH
+#define LUA_JROOT       LUA_LROOT
+#define LUA_RLPATH
+#define LUA_RCPATH
 #endif
-#define LUA_PATH_DEFAULT \
-  "./?.lua;" LUA_JDIR"?.lua;" LUA_LDIR"?.lua;" LUA_LDIR"?/init.lua" LUA_XPATH
-#define LUA_CPATH_DEFAULT \
-  "./?.so;" LUA_CDIR"?.so;" LUA_XCPATH LUA_CDIR"loadall.so"
+
+#define LUA_JPATH       ";" LUA_JROOT "/share" LUA_LJDIR "?.lua"
+#define LUA_LLDIR       LUA_LROOT "/share" LUA_LUADIR
+#define LUA_LCDIR       LUA_LROOT "/" LUA_LMULTILIB LUA_LUADIR
+#define LUA_LLPATH      ";" LUA_LLDIR "?.lua;" LUA_LLDIR "?/init.lua"
+#define LUA_LCPATH1     ";" LUA_LCDIR "?.so"
+#define LUA_LCPATH2     ";" LUA_LCDIR "loadall.so"
+
+#define LUA_PATH_DEFAULT        "./?.lua" LUA_JPATH LUA_LLPATH LUA_RLPATH
+#define LUA_CPATH_DEFAULT       "./?.so" LUA_LCPATH1 LUA_RCPATH LUA_LCPATH2
 #endif
 
 /* Environment variable names for path overrides and initialization code. */