60 lines
1.8 KiB
Diff
60 lines
1.8 KiB
Diff
From 095afbeda6c28a39ee3bdfc200f4fda1f5297506 Mon Sep 17 00:00:00 2001
|
|
From: Eric Bailey <eric@ericb.me>
|
|
Date: Mon, 5 Jun 2017 16:34:52 -0500
|
|
Subject: [PATCH] Fix Makefile regression wrt bin/lfeexec
|
|
|
|
- Separate install target into install-{beam,bin}
|
|
- Use install's -t flag in install-{beam,bin}
|
|
- Add install-{beam,bin,man} to .PHONY
|
|
---
|
|
Makefile | 22 ++++++++++++++--------
|
|
1 file changed, 14 insertions(+), 8 deletions(-)
|
|
|
|
diff --git a/Makefile b/Makefile
|
|
index 59f2c06..01a364a 100644
|
|
--- a/Makefile
|
|
+++ b/Makefile
|
|
@@ -89,7 +89,7 @@ $(EBINDIR)/%.beam: $(LSRCDIR)/%.lfe
|
|
|
|
all: compile
|
|
|
|
-.PHONY: compile erlc-compile lfec-compile erlc-lfec emacs install docs clean docker-build docker-push docker update-mandb
|
|
+.PHONY: compile erlc-compile lfec-compile erlc-lfec emacs install install-beam install-bin install-man docs clean docker-build docker-push docker update-mandb
|
|
|
|
compile: comp_opts.mk
|
|
$(MAKE) $(MFLAGS) erlc-lfec
|
|
@@ -117,17 +117,23 @@ comp_opts.mk:
|
|
|
|
-include comp_opts.mk
|
|
|
|
-$(BINDIR)/lfe%:
|
|
- $(INSTALL_BIN) $@ $(DESTBINDIR)
|
|
+install: compile install-beam install-bin install-man
|
|
|
|
-install: compile install-man
|
|
+install-beam:
|
|
rm -Rf $(DESTEBINDIR)
|
|
$(INSTALL_DIR) $(DESTEBINDIR)
|
|
- $(INSTALL_DATA) $(EBINDIR)/$(APP_DEF) $(DESTEBINDIR)
|
|
- $(INSTALL_DATA) $(addprefix $(EBINDIR)/, $(EBINS)) $(DESTEBINDIR)
|
|
- $(INSTALL_DATA) $(addprefix $(EBINDIR)/, $(LBINS)) $(DESTEBINDIR)
|
|
+ $(INSTALL_DATA) -t $(DESTEBINDIR) \
|
|
+ $(EBINDIR)/$(APP_DEF) \
|
|
+ $(addprefix $(EBINDIR)/, $(EBINS)) \
|
|
+ $(addprefix $(EBINDIR)/, $(LBINS))
|
|
+
|
|
+install-bin:
|
|
$(INSTALL_DIR) $(DESTBINDIR)
|
|
- $(MAKE) $(BINDIR)/lfe $(BINDIR)/lfec $(BINDIR)/lfedoc $(BINDIR)/lfescript
|
|
+ $(INSTALL_BIN) -t $(DESTBINDIR) \
|
|
+ $(BINDIR)/lfe \
|
|
+ $(BINDIR)/lfec \
|
|
+ $(BINDIR)/lfedoc \
|
|
+ $(BINDIR)/lfescript
|
|
ln -sf $(DESTBINDIR)/* $(PREFIX)/bin/
|
|
|
|
clean:
|
|
--
|
|
2.42.0.windows.2
|
|
|