diff options
author | Mike Pall <mike> | 2024-11-14 17:09:07 +0100 |
---|---|---|
committer | Mike Pall <mike> | 2024-11-14 17:09:07 +0100 |
commit | 9ce8f1ff8e5298c4d921d9f0b4a3fc1f965b3f22 (patch) | |
tree | 317f607a6d61fc46c78fe4521f42935514d7e58d /Makefile | |
parent | 69bbf3c1b01de8239444b0c430a89fa868978fea (diff) | |
download | luajit-9ce8f1ff8e5298c4d921d9f0b4a3fc1f965b3f22.tar.gz luajit-9ce8f1ff8e5298c4d921d9f0b4a3fc1f965b3f22.tar.bz2 luajit-9ce8f1ff8e5298c4d921d9f0b4a3fc1f965b3f22.zip |
Fix override of INSTALL_LJLIBD in the presence of DESTDIR.
Reported by faithanalog. #1239 #1303
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 9 |
1 files changed, 5 insertions, 4 deletions
@@ -37,12 +37,13 @@ export MULTILIB= lib | |||
37 | DPREFIX= $(DESTDIR)$(PREFIX) | 37 | DPREFIX= $(DESTDIR)$(PREFIX) |
38 | INSTALL_BIN= $(DPREFIX)/bin | 38 | INSTALL_BIN= $(DPREFIX)/bin |
39 | INSTALL_LIB= $(DPREFIX)/$(MULTILIB) | 39 | INSTALL_LIB= $(DPREFIX)/$(MULTILIB) |
40 | INSTALL_SHARE= $(DPREFIX)/share | 40 | INSTALL_SHARE_= $(PREFIX)/share |
41 | INSTALL_SHARE= $(DESTDIR)$(INSTALL_SHARE_) | ||
41 | INSTALL_DEFINC= $(DPREFIX)/include/luajit-$(MMVERSION) | 42 | INSTALL_DEFINC= $(DPREFIX)/include/luajit-$(MMVERSION) |
42 | INSTALL_INC= $(INSTALL_DEFINC) | 43 | INSTALL_INC= $(INSTALL_DEFINC) |
43 | 44 | ||
44 | export INSTALL_LJLIBD= $(INSTALL_SHARE)/luajit-$(MMVERSION) | 45 | export INSTALL_LJLIBD= $(INSTALL_SHARE_)/luajit-$(MMVERSION) |
45 | INSTALL_JITLIB= $(INSTALL_LJLIBD)/jit | 46 | INSTALL_JITLIB= $(DESTDIR)$(INSTALL_LJLIBD)/jit |
46 | INSTALL_LMODD= $(INSTALL_SHARE)/lua | 47 | INSTALL_LMODD= $(INSTALL_SHARE)/lua |
47 | INSTALL_LMOD= $(INSTALL_LMODD)/$(ABIVER) | 48 | INSTALL_LMOD= $(INSTALL_LMODD)/$(ABIVER) |
48 | INSTALL_CMODD= $(INSTALL_LIB)/lua | 49 | INSTALL_CMODD= $(INSTALL_LIB)/lua |
@@ -71,7 +72,7 @@ INSTALL_PC= $(INSTALL_PKGCONFIG)/$(INSTALL_PCNAME) | |||
71 | 72 | ||
72 | INSTALL_DIRS= $(INSTALL_BIN) $(INSTALL_LIB) $(INSTALL_INC) $(INSTALL_MAN) \ | 73 | INSTALL_DIRS= $(INSTALL_BIN) $(INSTALL_LIB) $(INSTALL_INC) $(INSTALL_MAN) \ |
73 | $(INSTALL_PKGCONFIG) $(INSTALL_JITLIB) $(INSTALL_LMOD) $(INSTALL_CMOD) | 74 | $(INSTALL_PKGCONFIG) $(INSTALL_JITLIB) $(INSTALL_LMOD) $(INSTALL_CMOD) |
74 | UNINSTALL_DIRS= $(INSTALL_JITLIB) $(INSTALL_LJLIBD) $(INSTALL_INC) \ | 75 | UNINSTALL_DIRS= $(INSTALL_JITLIB) $(DESTDIR)$(INSTALL_LJLIBD) $(INSTALL_INC) \ |
75 | $(INSTALL_LMOD) $(INSTALL_LMODD) $(INSTALL_CMOD) $(INSTALL_CMODD) | 76 | $(INSTALL_LMOD) $(INSTALL_LMODD) $(INSTALL_CMOD) $(INSTALL_CMODD) |
76 | 77 | ||
77 | RM= rm -f | 78 | RM= rm -f |