aboutsummaryrefslogtreecommitdiff
path: root/luaconf.h
diff options
context:
space:
mode:
authorRoberto Ierusalimschy <roberto@inf.puc-rio.br>2010-07-25 12:02:41 -0300
committerRoberto Ierusalimschy <roberto@inf.puc-rio.br>2010-07-25 12:02:41 -0300
commit85c1461422a8a97a25ee385793def9c89e70739c (patch)
tree8ba8ec0d5500067760800bba65ea7499db30adf6 /luaconf.h
parent5ba556d27a0114d43941335fab4968c51dd1cef5 (diff)
downloadlua-85c1461422a8a97a25ee385793def9c89e70739c.tar.gz
lua-85c1461422a8a97a25ee385793def9c89e70739c.tar.bz2
lua-85c1461422a8a97a25ee385793def9c89e70739c.zip
new macros LUA_VERSION_{MAJOR/MINOR/RELEASE}
Diffstat (limited to 'luaconf.h')
-rw-r--r--luaconf.h8
1 files changed, 5 insertions, 3 deletions
diff --git a/luaconf.h b/luaconf.h
index 3755e7c7..8a81f189 100644
--- a/luaconf.h
+++ b/luaconf.h
@@ -1,5 +1,5 @@
1/* 1/*
2** $Id: luaconf.h,v 1.139 2010/05/28 14:27:07 roberto Exp roberto $ 2** $Id: luaconf.h,v 1.140 2010/07/18 14:34:45 roberto Exp roberto $
3** Configuration file for Lua 3** Configuration file for Lua
4** See Copyright Notice in lua.h 4** See Copyright Notice in lua.h
5*/ 5*/
@@ -90,9 +90,11 @@
90 LUA_CDIR"?.dll;" LUA_CDIR"loadall.dll;" ".\\?.dll" 90 LUA_CDIR"?.dll;" LUA_CDIR"loadall.dll;" ".\\?.dll"
91 91
92#else /* }{ */ 92#else /* }{ */
93
94#define LUA_VDIR LUA_VERSION_MAJOR "." LUA_VERSION_MINOR "/"
93#define LUA_ROOT "/usr/local/" 95#define LUA_ROOT "/usr/local/"
94#define LUA_LDIR LUA_ROOT "share/lua/5.2/" 96#define LUA_LDIR LUA_ROOT "share/lua/" LUA_VDIR
95#define LUA_CDIR LUA_ROOT "lib/lua/5.2/" 97#define LUA_CDIR LUA_ROOT "lib/lua/" LUA_VDIR
96#define LUA_PATH_DEFAULT \ 98#define LUA_PATH_DEFAULT \
97 LUA_LDIR"?.lua;" LUA_LDIR"?/init.lua;" \ 99 LUA_LDIR"?.lua;" LUA_LDIR"?/init.lua;" \
98 LUA_CDIR"?.lua;" LUA_CDIR"?/init.lua;" "./?.lua" 100 LUA_CDIR"?.lua;" LUA_CDIR"?/init.lua;" "./?.lua"