diff options
author | Loïc Hoguin <[email protected]> | 2023-05-23 14:46:00 +0200 |
---|---|---|
committer | Loïc Hoguin <[email protected]> | 2023-05-23 14:46:00 +0200 |
commit | f368ac4fc719e0eb28bb7c3f5d2384eddf65fca3 (patch) | |
tree | 8a0d6186963ba684486c2c4b96282b74201ccf07 /plugins/escript.mk | |
parent | b92e8da1b7b48321be8a8c5951af27914aeb8952 (diff) | |
download | erlang.mk-f368ac4fc719e0eb28bb7c3f5d2384eddf65fca3.tar.gz erlang.mk-f368ac4fc719e0eb28bb7c3f5d2384eddf65fca3.tar.bz2 erlang.mk-f368ac4fc719e0eb28bb7c3f5d2384eddf65fca3.zip |
Add a test for ESCRIPT_ZIP_FILE and abspath the value
This way we can just configure it to a local folder
without having to use $(CURDIR).
Diffstat (limited to 'plugins/escript.mk')
-rw-r--r-- | plugins/escript.mk | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/plugins/escript.mk b/plugins/escript.mk index 2719a03..1790dcb 100644 --- a/plugins/escript.mk +++ b/plugins/escript.mk @@ -29,11 +29,11 @@ help:: escript-zip:: FULL=1 escript-zip:: deps app - $(verbose) mkdir -p $(dir $(ESCRIPT_ZIP_FILE)) - $(verbose) rm -f $(ESCRIPT_ZIP_FILE) - $(gen_verbose) cd .. && $(ESCRIPT_ZIP) $(ESCRIPT_ZIP_FILE) $(PROJECT)/ebin/* + $(verbose) mkdir -p $(dir $(abspath $(ESCRIPT_ZIP_FILE))) + $(verbose) rm -f $(abspath $(ESCRIPT_ZIP_FILE)) + $(gen_verbose) cd .. && $(ESCRIPT_ZIP) $(abspath $(ESCRIPT_ZIP_FILE)) $(PROJECT)/ebin/* ifneq ($(DEPS),) - $(verbose) cd $(DEPS_DIR) && $(ESCRIPT_ZIP) $(ESCRIPT_ZIP_FILE) \ + $(verbose) cd $(DEPS_DIR) && $(ESCRIPT_ZIP) $(abspath $(ESCRIPT_ZIP_FILE)) \ $(subst $(DEPS_DIR)/,,$(addsuffix /*,$(wildcard \ $(addsuffix /ebin,$(shell cat $(ERLANG_MK_TMP)/deps.log))))) endif @@ -43,8 +43,8 @@ escript:: escript-zip "#!$(ESCRIPT_SHEBANG)" \ "%% $(ESCRIPT_COMMENT)" \ "%%! $(ESCRIPT_EMU_ARGS)" > $(ESCRIPT_FILE) - $(verbose) cat $(ESCRIPT_ZIP_FILE) >> $(ESCRIPT_FILE) + $(verbose) cat $(abspath $(ESCRIPT_ZIP_FILE)) >> $(ESCRIPT_FILE) $(verbose) chmod +x $(ESCRIPT_FILE) distclean-escript: - $(gen_verbose) rm -f $(ESCRIPT_FILE) + $(gen_verbose) rm -f $(ESCRIPT_FILE) $(abspath $(ESCRIPT_ZIP_FILE)) |