diff options
| author | Mike Pall <mike> | 2022-08-15 14:16:39 +0200 |
|---|---|---|
| committer | Mike Pall <mike> | 2022-08-15 14:16:39 +0200 |
| commit | 975ec13f5d5aefcac1dbb15fa867e660e07c93a1 (patch) | |
| tree | 32bcd0316b67e261de7cf889829757a6b9d65bbc | |
| parent | 633f265f67f322cbe2c5fd11d3e46d968ac220f7 (diff) | |
| parent | 3b3d427ae3bdb56c46ee75f7f596c837e97c5043 (diff) | |
| download | luajit-975ec13f5d5aefcac1dbb15fa867e660e07c93a1.tar.gz luajit-975ec13f5d5aefcac1dbb15fa867e660e07c93a1.tar.bz2 luajit-975ec13f5d5aefcac1dbb15fa867e660e07c93a1.zip | |
Merge branch 'master' into v2.1
| -rw-r--r-- | Makefile | 6 |
1 files changed, 5 insertions, 1 deletions
| @@ -33,7 +33,8 @@ DPREFIX= $(DESTDIR)$(PREFIX) | |||
| 33 | INSTALL_BIN= $(DPREFIX)/bin | 33 | INSTALL_BIN= $(DPREFIX)/bin |
| 34 | INSTALL_LIB= $(DPREFIX)/$(MULTILIB) | 34 | INSTALL_LIB= $(DPREFIX)/$(MULTILIB) |
| 35 | INSTALL_SHARE= $(DPREFIX)/share | 35 | INSTALL_SHARE= $(DPREFIX)/share |
| 36 | INSTALL_INC= $(DPREFIX)/include/luajit-$(MAJVER).$(MINVER) | 36 | INSTALL_DEFINC= $(DPREFIX)/include/luajit-$(MAJVER).$(MINVER) |
| 37 | INSTALL_INC= $(INSTALL_DEFINC) | ||
| 37 | 38 | ||
| 38 | INSTALL_LJLIBD= $(INSTALL_SHARE)/luajit-$(VERSION) | 39 | INSTALL_LJLIBD= $(INSTALL_SHARE)/luajit-$(VERSION) |
| 39 | INSTALL_JITLIB= $(INSTALL_LJLIBD)/jit | 40 | INSTALL_JITLIB= $(INSTALL_LJLIBD)/jit |
| @@ -78,6 +79,9 @@ UNINSTALL= $(RM) | |||
| 78 | LDCONFIG= ldconfig -n 2>/dev/null | 79 | LDCONFIG= ldconfig -n 2>/dev/null |
| 79 | SED_PC= sed -e "s|^prefix=.*|prefix=$(PREFIX)|" \ | 80 | SED_PC= sed -e "s|^prefix=.*|prefix=$(PREFIX)|" \ |
| 80 | -e "s|^multilib=.*|multilib=$(MULTILIB)|" | 81 | -e "s|^multilib=.*|multilib=$(MULTILIB)|" |
| 82 | ifneq ($(INSTALL_DEFINC),$(INSTALL_INC)) | ||
| 83 | SED_PC+= -e "s|^includedir=.*|includedir=$(INSTALL_INC)|" | ||
| 84 | endif | ||
| 81 | 85 | ||
| 82 | FILE_T= luajit | 86 | FILE_T= luajit |
| 83 | FILE_A= libluajit.a | 87 | FILE_A= libluajit.a |