diff options
author | Mike Pall <mike> | 2013-07-09 17:30:36 +0200 |
---|---|---|
committer | Mike Pall <mike> | 2013-07-09 17:30:36 +0200 |
commit | 146807b7e82a8a5b9999928c4a767f1d0db11b82 (patch) | |
tree | 8146118cba06f4663752008973a5c9ec3c07de74 /Makefile | |
parent | 88188d52f763aa8bb686003bd459d8b605998850 (diff) | |
parent | 519ef0cba7ebceb99e727da9655692d137854188 (diff) | |
download | luajit-146807b7e82a8a5b9999928c4a767f1d0db11b82.tar.gz luajit-146807b7e82a8a5b9999928c4a767f1d0db11b82.tar.bz2 luajit-146807b7e82a8a5b9999928c4a767f1d0db11b82.zip |
Merge branch 'master' into v2.1
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -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 | # |
28 | export PREFIX= /usr/local | 28 | export PREFIX= /usr/local |
29 | export MULTILIB= lib | ||
29 | ############################################################################## | 30 | ############################################################################## |
30 | 31 | ||
31 | DPREFIX= $(DESTDIR)$(PREFIX) | 32 | DPREFIX= $(DESTDIR)$(PREFIX) |
32 | INSTALL_BIN= $(DPREFIX)/bin | 33 | INSTALL_BIN= $(DPREFIX)/bin |
33 | INSTALL_LIB= $(DPREFIX)/lib | 34 | INSTALL_LIB= $(DPREFIX)/$(MULTILIB) |
34 | INSTALL_SHARE= $(DPREFIX)/share | 35 | INSTALL_SHARE= $(DPREFIX)/share |
35 | INSTALL_INC= $(DPREFIX)/include/luajit-$(MAJVER).$(MINVER) | 36 | INSTALL_INC= $(DPREFIX)/include/luajit-$(MAJVER).$(MINVER) |
36 | 37 | ||
@@ -74,7 +75,8 @@ INSTALL_X= install -m 0755 | |||
74 | INSTALL_F= install -m 0644 | 75 | INSTALL_F= install -m 0644 |
75 | UNINSTALL= $(RM) | 76 | UNINSTALL= $(RM) |
76 | LDCONFIG= ldconfig -n | 77 | LDCONFIG= ldconfig -n |
77 | SED_PC= sed -e "s|^prefix=.*|prefix=$(PREFIX)|" | 78 | SED_PC= sed -e "s|^prefix=.*|prefix=$(PREFIX)|" \ |
79 | -e "s|^multilib=.*|multilib=$(MULTILIB)|" | ||
78 | 80 | ||
79 | FILE_T= luajit | 81 | FILE_T= luajit |
80 | FILE_A= libluajit.a | 82 | FILE_A= libluajit.a |