summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Silverstone <daniel.silverstone@codethink.co.uk>2012-08-21 15:21:59 +0100
committerDaniel Silverstone <daniel.silverstone@codethink.co.uk>2012-08-21 15:21:59 +0100
commit00ff20288f43775d5ac350af85b1492fe72cc61e (patch)
treef2ab2c49072a9a75adbab8936f2223ad2a9d83e3
parent2bfeeac1848874066eb29f15d246db96b3f3285d (diff)
downloadlua-00ff20288f43775d5ac350af85b1492fe72cc61e.tar.gz
Support /usr/* for package loads
-rw-r--r--src/luaconf.h.orig13
1 files changed, 10 insertions, 3 deletions
diff --git a/src/luaconf.h.orig b/src/luaconf.h.orig
index e2cb261..2fb92a1 100644
--- a/src/luaconf.h.orig
+++ b/src/luaconf.h.orig
@@ -95,13 +95,20 @@
#else
#define LUA_ROOT "/usr/local/"
+#define LUA_ROOT2 "/usr/"
#define LUA_LDIR LUA_ROOT "share/lua/5.1/"
#define LUA_CDIR LUA_ROOT "lib/lua/5.1/"
+#define LUA_LDIR2 LUA_ROOT2 "share/lua/5.1/"
+#define LUA_CDIR2 LUA_ROOT2 "lib/lua/5.1/"
#define LUA_PATH_DEFAULT \
- "./?.lua;" LUA_LDIR"?.lua;" LUA_LDIR"?/init.lua;" \
- LUA_CDIR"?.lua;" LUA_CDIR"?/init.lua"
+ "./?.lua;" \
+ LUA_LDIR"?.lua;" LUA_LDIR"?/init.lua;" \
+ LUA_CDIR"?.lua;" LUA_CDIR"?/init.lua;" \
+ LUA_LDIR2"?.lua;" LUA_LDIR2"?/init.lua;" \
+ LUA_CDIR2"?.lua;" LUA_CDIR2"?/init.lua"
#define LUA_CPATH_DEFAULT \
- "./?.so;" LUA_CDIR"?.so;" LUA_CDIR"loadall.so"
+ "./?.so;" LUA_CDIR"?.so;" LUA_CDIR"loadall.so;" \
+ LUA_CDIR2"?.so;" LUA_CDIR2"loadall.so"
#endif