aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorMike Pall <mike>2013-07-09 17:30:36 +0200
committerMike Pall <mike>2013-07-09 17:30:36 +0200
commit146807b7e82a8a5b9999928c4a767f1d0db11b82 (patch)
tree8146118cba06f4663752008973a5c9ec3c07de74 /Makefile
parent88188d52f763aa8bb686003bd459d8b605998850 (diff)
parent519ef0cba7ebceb99e727da9655692d137854188 (diff)
downloadluajit-146807b7e82a8a5b9999928c4a767f1d0db11b82.tar.gz
luajit-146807b7e82a8a5b9999928c4a767f1d0db11b82.tar.bz2
luajit-146807b7e82a8a5b9999928c4a767f1d0db11b82.zip
Merge branch 'master' into v2.1
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile6
1 files changed, 4 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 40c22434..327151a7 100644
--- a/Makefile
+++ b/Makefile
@@ -26,11 +26,12 @@ ABIVER= 5.1
26# the paths in src/luaconf.h, too. Note: PREFIX must be an absolute path! 26# the paths in src/luaconf.h, too. Note: PREFIX must be an absolute path!
27# 27#
28export PREFIX= /usr/local 28export PREFIX= /usr/local
29export MULTILIB= lib
29############################################################################## 30##############################################################################
30 31
31DPREFIX= $(DESTDIR)$(PREFIX) 32DPREFIX= $(DESTDIR)$(PREFIX)
32INSTALL_BIN= $(DPREFIX)/bin 33INSTALL_BIN= $(DPREFIX)/bin
33INSTALL_LIB= $(DPREFIX)/lib 34INSTALL_LIB= $(DPREFIX)/$(MULTILIB)
34INSTALL_SHARE= $(DPREFIX)/share 35INSTALL_SHARE= $(DPREFIX)/share
35INSTALL_INC= $(DPREFIX)/include/luajit-$(MAJVER).$(MINVER) 36INSTALL_INC= $(DPREFIX)/include/luajit-$(MAJVER).$(MINVER)
36 37
@@ -74,7 +75,8 @@ INSTALL_X= install -m 0755
74INSTALL_F= install -m 0644 75INSTALL_F= install -m 0644
75UNINSTALL= $(RM) 76UNINSTALL= $(RM)
76LDCONFIG= ldconfig -n 77LDCONFIG= ldconfig -n
77SED_PC= sed -e "s|^prefix=.*|prefix=$(PREFIX)|" 78SED_PC= sed -e "s|^prefix=.*|prefix=$(PREFIX)|" \
79 -e "s|^multilib=.*|multilib=$(MULTILIB)|"
78 80
79FILE_T= luajit 81FILE_T= luajit
80FILE_A= libluajit.a 82FILE_A= libluajit.a