From ee74c236246cc2567b00578bbc760e38ee42fdfd Mon Sep 17 00:00:00 2001 From: Kyle Evans Date: Sat, 2 Nov 2019 03:37:58 +0000 Subject: stand: consolidate knowledge of lua path Multiple places coordinate to 'know' where lua scripts are installed. Knock this down to being formally defined (and overridable) in exactly one spot, defs.mk, and spread the knowledge to loaders and liblua alike. A future commit will expose this to lua as loader.lua_path, so it can build absolute paths to lua scripts as needed. MFC after: 1 week --- stand/liblua/Makefile | 2 +- stand/liblua/luaconf.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'stand/liblua') 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 -- cgit v1.3