diff options
author | Loïc Hoguin <[email protected]> | 2014-08-20 16:02:26 +0300 |
---|---|---|
committer | Loïc Hoguin <[email protected]> | 2014-08-20 16:02:26 +0300 |
commit | e89e4208263350f11b5ede9eae1e809401ca05af (patch) | |
tree | c9c5a2d65ad90e962cc3c23b5270bc78d9f389a4 | |
parent | dbceaada33b1ad5def2869424e6a2b19735a9954 (diff) | |
parent | 05d95c23d0f856ec858908774e7b296d98b25ebf (diff) | |
download | erlang.mk-e89e4208263350f11b5ede9eae1e809401ca05af.tar.gz erlang.mk-e89e4208263350f11b5ede9eae1e809401ca05af.tar.bz2 erlang.mk-e89e4208263350f11b5ede9eae1e809401ca05af.zip |
Merge branch 'master' of git://github.com/peerst/erlang.mk
-rw-r--r-- | core/deps.mk | 2 | ||||
-rw-r--r-- | erlang.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/deps.mk b/core/deps.mk index 1c1892f..cfb432d 100644 --- a/core/deps.mk +++ b/core/deps.mk @@ -57,7 +57,7 @@ $(DEPS_DIR)/$(1): @mkdir -p $(DEPS_DIR) @if [ ! -f $(PKG_FILE2) ]; then $(call core_http_get,$(PKG_FILE2),$(PKG_FILE_URL)); fi ifeq (,$(dep_$(1))) - DEPPKG=$$$$(awk 'BEGIN { FS = "\t" }; $$$$1 == "$(1)" { print $$$$2 " " $$$$3 " " $$$$4 }' $(PKG_FILE2);) \ + DEPPKG=$$$$(awk 'BEGIN { FS = "\t" }; $$$$1 == "$(1)" { print $$$$2 " " $$$$3 " " $$$$4 }' $(PKG_FILE2);); \ VS=$$$$(echo $$$$DEPPKG | cut -d " " -f1); \ REPO=$$$$(echo $$$$DEPPKG | cut -d " " -f2); \ COMMIT=$$$$(echo $$$$DEPPKG | cut -d " " -f3); \ @@ -125,7 +125,7 @@ $(DEPS_DIR)/$(1): @mkdir -p $(DEPS_DIR) @if [ ! -f $(PKG_FILE2) ]; then $(call core_http_get,$(PKG_FILE2),$(PKG_FILE_URL)); fi ifeq (,$(dep_$(1))) - DEPPKG=$$$$(awk 'BEGIN { FS = "\t" }; $$$$1 == "$(1)" { print $$$$2 " " $$$$3 " " $$$$4 }' $(PKG_FILE2);) \ + DEPPKG=$$$$(awk 'BEGIN { FS = "\t" }; $$$$1 == "$(1)" { print $$$$2 " " $$$$3 " " $$$$4 }' $(PKG_FILE2);); \ VS=$$$$(echo $$$$DEPPKG | cut -d " " -f1); \ REPO=$$$$(echo $$$$DEPPKG | cut -d " " -f2); \ COMMIT=$$$$(echo $$$$DEPPKG | cut -d " " -f3); \ |