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 | luajit2-975ec13f5d5aefcac1dbb15fa867e660e07c93a1.tar.gz | |
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) INSTALL_BIN= $(DPREFIX)/bin INSTALL_LIB= $(DPREFIX)/$(MULTILIB) INSTALL_SHARE= $(DPREFIX)/share -INSTALL_INC= $(DPREFIX)/include/luajit-$(MAJVER).$(MINVER) +INSTALL_DEFINC= $(DPREFIX)/include/luajit-$(MAJVER).$(MINVER) +INSTALL_INC= $(INSTALL_DEFINC) INSTALL_LJLIBD= $(INSTALL_SHARE)/luajit-$(VERSION) INSTALL_JITLIB= $(INSTALL_LJLIBD)/jit @@ -78,6 +79,9 @@ UNINSTALL= $(RM) LDCONFIG= ldconfig -n 2>/dev/null SED_PC= sed -e "s|^prefix=.*|prefix=$(PREFIX)|" \ -e "s|^multilib=.*|multilib=$(MULTILIB)|" +ifneq ($(INSTALL_DEFINC),$(INSTALL_INC)) + SED_PC+= -e "s|^includedir=.*|includedir=$(INSTALL_INC)|" +endif FILE_T= luajit FILE_A= libluajit.a |