gh-mirror/mikepaul-LuaJIT
1
0
Fork 0
mirror of https://github.com/LuaJIT/LuaJIT.git synced 2025-02-07 15:14:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Reflect override of INSTALL_LJLIBD in package.path.

Browse Source 
Suggested by GitSparTV. #1239
This commit is contained in:
Mike Pall 2024-08-15 00:38:43 +02:00
parent 6f834087d0
commit ae4735f621
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -41,7 +41,7 @@ INSTALL_SHARE= $(DPREFIX)/share
INSTALL_DEFINC= $(DPREFIX)/include/luajit-$(MMVERSION) INSTALL_DEFINC= $(DPREFIX)/include/luajit-$(MMVERSION)
INSTALL_INC= $(INSTALL_DEFINC) INSTALL_INC= $(INSTALL_DEFINC)
INSTALL_LJLIBD= $(INSTALL_SHARE)/luajit-$(MMVERSION) export INSTALL_LJLIBD= $(INSTALL_SHARE)/luajit-$(MMVERSION)
INSTALL_JITLIB= $(INSTALL_LJLIBD)/jit INSTALL_JITLIB= $(INSTALL_LJLIBD)/jit
INSTALL_LMODD= $(INSTALL_SHARE)/lua INSTALL_LMODD= $(INSTALL_SHARE)/lua
INSTALL_LMOD= $(INSTALL_LMODD)/$(ABIVER) INSTALL_LMOD= $(INSTALL_LMODD)/$(ABIVER)

3
src/Makefile
View File

@ -299,6 +299,9 @@ endif
ifneq (,$(LMULTILIB)) ifneq (,$(LMULTILIB))
TARGET_XCFLAGS+= -DLUA_LMULTILIB=\"$(LMULTILIB)\" TARGET_XCFLAGS+= -DLUA_LMULTILIB=\"$(LMULTILIB)\"
endif endif
ifneq (,$(INSTALL_LJLIBD))
TARGET_XCFLAGS+= -DLUA_LJDIR=\"$(INSTALL_LJLIBD)\"
endif
############################################################################## ##############################################################################
# Target system detection. # Target system detection.

7
src/luaconf.h
View File

@ -37,7 +37,6 @@
#endif #endif
#define LUA_LROOT "/usr/local" #define LUA_LROOT "/usr/local"
#define LUA_LUADIR "/lua/5.1/" #define LUA_LUADIR "/lua/5.1/"
#define LUA_LJDIR "/luajit-2.1/"
#ifdef LUA_ROOT #ifdef LUA_ROOT
#define LUA_JROOT LUA_ROOT #define LUA_JROOT LUA_ROOT
@ -51,7 +50,11 @@
#define LUA_RCPATH #define LUA_RCPATH
#endif #endif
#define LUA_JPATH ";" LUA_JROOT "/share" LUA_LJDIR "?.lua" #ifndef LUA_LJDIR
#define LUA_LJDIR LUA_JROOT "/share/luajit-2.1"
#endif
#define LUA_JPATH ";" LUA_LJDIR "/?.lua"
#define LUA_LLDIR LUA_LROOT "/share" LUA_LUADIR #define LUA_LLDIR LUA_LROOT "/share" LUA_LUADIR
#define LUA_LCDIR LUA_LROOT "/" LUA_LMULTILIB LUA_LUADIR #define LUA_LCDIR LUA_LROOT "/" LUA_LMULTILIB LUA_LUADIR
#define LUA_LLPATH ";" LUA_LLDIR "?.lua;" LUA_LLDIR "?/init.lua" #define LUA_LLPATH ";" LUA_LLDIR "?.lua;" LUA_LLDIR "?/init.lua"