aboutsummaryrefslogtreecommitdiff
path: root/stand/liblua
diff options
context:
space:
mode:
authorKyle Evans <kevans@FreeBSD.org>2019-11-02 03:37:58 +0000
committerKyle Evans <kevans@FreeBSD.org>2019-11-02 03:37:58 +0000
commitee74c236246cc2567b00578bbc760e38ee42fdfd (patch)
tree06746df0644db5a1f7c397652bb360dfbd5d5ec1 /stand/liblua
parentabc4b11cea129f81d1cd5b48b0104dd2f5555f83 (diff)
Notes
Diffstat (limited to 'stand/liblua')
-rw-r--r--stand/liblua/Makefile2
-rw-r--r--stand/liblua/luaconf.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/stand/liblua/Makefile b/stand/liblua/Makefile
index edbbf60b2d25..49ed02709299 100644
--- a/stand/liblua/Makefile
+++ b/stand/liblua/Makefile
@@ -27,7 +27,7 @@ SRCS+= lerrno.c lfs.c lstd.c lutils.c
WARNS= 3
-CFLAGS+= -DLUA_PATH_DEFAULT=\"/boot/lua/\?.lua\"
+CFLAGS+= -DLUA_PATH=\"${LUAPATH}\" -DLUA_PATH_DEFAULT=\"${LUAPATH}/\?.lua\"
CFLAGS+= -ffreestanding -nostdlib -DLUA_USE_POSIX
CFLAGS+= -fno-stack-protector -D__BSD_VISIBLE
CFLAGS+= -I${BOOTSRC}/include -I${LIBLUASRC} -I${LUASRC} -I${LDRSRC}
diff --git a/stand/liblua/luaconf.h b/stand/liblua/luaconf.h
index f3a1b4ec9ad5..dd642cba92f4 100644
--- a/stand/liblua/luaconf.h
+++ b/stand/liblua/luaconf.h
@@ -202,7 +202,7 @@
#else /* }{ */
-#define LUA_ROOT "/boot/lua/" LUA_VDIR "/"
+#define LUA_ROOT LUA_PATH "/" LUA_VDIR "/"
#define LUA_LDIR LUA_ROOT "share/"
#define LUA_CDIR LUA_ROOT "lib/"
#ifndef LUA_PATH_DEFAULT