aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorMike Pall <mike>2022-08-15 14:16:39 +0200
committerMike Pall <mike>2022-08-15 14:16:39 +0200
commit975ec13f5d5aefcac1dbb15fa867e660e07c93a1 (patch)
tree32bcd0316b67e261de7cf889829757a6b9d65bbc /Makefile
parent633f265f67f322cbe2c5fd11d3e46d968ac220f7 (diff)
parent3b3d427ae3bdb56c46ee75f7f596c837e97c5043 (diff)
downloadluajit-975ec13f5d5aefcac1dbb15fa867e660e07c93a1.tar.gz
luajit-975ec13f5d5aefcac1dbb15fa867e660e07c93a1.tar.bz2
luajit-975ec13f5d5aefcac1dbb15fa867e660e07c93a1.zip
Merge branch 'master' into v2.1
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile6
1 files changed, 5 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 10c83c73..b0288b4d 100644
--- a/Makefile
+++ b/Makefile
@@ -33,7 +33,8 @@ DPREFIX= $(DESTDIR)$(PREFIX)
33INSTALL_BIN= $(DPREFIX)/bin 33INSTALL_BIN= $(DPREFIX)/bin
34INSTALL_LIB= $(DPREFIX)/$(MULTILIB) 34INSTALL_LIB= $(DPREFIX)/$(MULTILIB)
35INSTALL_SHARE= $(DPREFIX)/share 35INSTALL_SHARE= $(DPREFIX)/share
36INSTALL_INC= $(DPREFIX)/include/luajit-$(MAJVER).$(MINVER) 36INSTALL_DEFINC= $(DPREFIX)/include/luajit-$(MAJVER).$(MINVER)
37INSTALL_INC= $(INSTALL_DEFINC)
37 38
38INSTALL_LJLIBD= $(INSTALL_SHARE)/luajit-$(VERSION) 39INSTALL_LJLIBD= $(INSTALL_SHARE)/luajit-$(VERSION)
39INSTALL_JITLIB= $(INSTALL_LJLIBD)/jit 40INSTALL_JITLIB= $(INSTALL_LJLIBD)/jit
@@ -78,6 +79,9 @@ UNINSTALL= $(RM)
78LDCONFIG= ldconfig -n 2>/dev/null 79LDCONFIG= ldconfig -n 2>/dev/null
79SED_PC= sed -e "s|^prefix=.*|prefix=$(PREFIX)|" \ 80SED_PC= sed -e "s|^prefix=.*|prefix=$(PREFIX)|" \
80 -e "s|^multilib=.*|multilib=$(MULTILIB)|" 81 -e "s|^multilib=.*|multilib=$(MULTILIB)|"
82ifneq ($(INSTALL_DEFINC),$(INSTALL_INC))
83 SED_PC+= -e "s|^includedir=.*|includedir=$(INSTALL_INC)|"
84endif
81 85
82FILE_T= luajit 86FILE_T= luajit
83FILE_A= libluajit.a 87FILE_A= libluajit.a