new items in default path for Windows

1 files changed, 10 insertions, 6 deletions

diff --git a/luaconf.h b/luaconf.h
index e40c559b..3afce703 100644
--- a/luaconf.h
+++ b/luaconf.h
@@ -1,5 +1,5 @@
 /*
-** $Id: luaconf.h,v 1.205 2014/05/27 13:59:03 roberto Exp roberto $
+** $Id: luaconf.h,v 1.206 2014/06/02 00:03:16 roberto Exp roberto $
 ** Configuration file for Lua
 ** See Copyright Notice in lua.h
 */
@@ -100,26 +100,30 @@
 ** hierarchy or if you want to install your libraries in
 ** non-conventional directories.
 */
-#if defined(_WIN32)     /* { */
+#define LUA_VDIR        LUA_VERSION_MAJOR "." LUA_VERSION_MINOR
+#if defined(_WIN32)     /* { */
 /*
 ** In Windows, any exclamation mark ('!') in the path is replaced by the
 ** path of the directory of the executable file of the current process.
 */
 #define LUA_LDIR        "!\\lua\\"
 #define LUA_CDIR        "!\\"
+#define LUA_SHRDIR      "!\\..\\share\\lua\\" LUA_VDIR "\\"
 #define LUA_PATH_DEFAULT  \
                 LUA_LDIR"?.lua;"  LUA_LDIR"?\\init.lua;" \
                 LUA_CDIR"?.lua;"  LUA_CDIR"?\\init.lua;" \
+                LUA_SHRDIR"?.lua;" LUA_SHRDIR"?\\init.lua;" \
                 ".\\?.lua;" ".\\?\\init.lua"
 #define LUA_CPATH_DEFAULT \
-                LUA_CDIR"?.dll;" LUA_CDIR"loadall.dll;" ".\\?.dll"
+                LUA_CDIR"?.dll;" \
+                LUA_CDIR"..\\lib\\lua\\" LUA_VDIR "\\?.dll;" \
+                LUA_CDIR"loadall.dll;" ".\\?.dll"
 
 #else                   /* }{ */
 
-#define LUA_VDIR        LUA_VERSION_MAJOR "." LUA_VERSION_MINOR "/"
 #define LUA_ROOT        "/usr/local/"
-#define LUA_LDIR        LUA_ROOT "share/lua/" LUA_VDIR
-#define LUA_CDIR        LUA_ROOT "lib/lua/" LUA_VDIR
+#define LUA_LDIR        LUA_ROOT "share/lua/" LUA_VDIR "/"
+#define LUA_CDIR        LUA_ROOT "lib/lua/" LUA_VDIR "/"
 #define LUA_PATH_DEFAULT  \
                 LUA_LDIR"?.lua;"  LUA_LDIR"?/init.lua;" \
                 LUA_CDIR"?.lua;"  LUA_CDIR"?/init.lua;" \