aboutsummaryrefslogtreecommitdiff
path: root/lib/liblua
diff options
context:
space:
mode:
authorEd Maste <emaste@FreeBSD.org>2020-08-13 00:19:05 +0000
committerEd Maste <emaste@FreeBSD.org>2020-08-13 00:19:05 +0000
commitbceabe277e1286ec694e34c186a73e7bf2c9de4f (patch)
tree276546db60c85a0ed856eead7d110872c2357621 /lib/liblua
parent40db51b42fe39e335c1c4d5abcc7f1adf862356e (diff)
downloadsrc-bceabe277e1286ec694e34c186a73e7bf2c9de4f.tar.gz
src-bceabe277e1286ec694e34c186a73e7bf2c9de4f.zip
flua: initial support for "require" in the base system
Use /usr not /usr/local for base system components. Use /usr/lib/flua and /usr/share/flua (not lua) for consistency and to avoid the possibility that other software accidentally finds our base system modules. Also drop the version from the path, as flua represents an unspecified lua version that corresponds to the FreeBSD version it comes with. LUA_USE_DLOPEN is not yet enabled because some additional changes are needed wrt symbol visibility. Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D24605
Notes
Notes: svn path=/head/; revision=364182
Diffstat (limited to 'lib/liblua')
-rw-r--r--lib/liblua/luaconf.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/liblua/luaconf.h b/lib/liblua/luaconf.h
index b24645b8915f..db6f3222f101 100644
--- a/lib/liblua/luaconf.h
+++ b/lib/liblua/luaconf.h
@@ -205,9 +205,9 @@
#else /* }{ */
-#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_ROOT "/usr/"
+#define LUA_LDIR LUA_ROOT "share/flua/"
+#define LUA_CDIR LUA_ROOT "lib/flua/"
#if !defined(LUA_PATH_DEFAULT)
#define LUA_PATH_DEFAULT \
LUA_LDIR"?.lua;" LUA_LDIR"?/init.lua;" \