diff options
| author | Loïc Hoguin <[email protected]> | 2023-05-15 17:22:01 +0200 |
|---|---|---|
| committer | Loïc Hoguin <[email protected]> | 2023-05-15 17:37:43 +0200 |
| commit | 269544fe49269f3cf7b9f4eee3d3f9fab9975382 (patch) | |
| tree | 5070c42b8a08702aee3387391b2306368504731a /core | |
| parent | e8bcb0800363d781359ca3726d5825c3a05ed21d (diff) | |
| download | erlang.mk-269544fe49269f3cf7b9f4eee3d3f9fab9975382.tar.gz erlang.mk-269544fe49269f3cf7b9f4eee3d3f9fab9975382.tar.bz2 erlang.mk-269544fe49269f3cf7b9f4eee3d3f9fab9975382.zip | |
Use $(CACHE_DIR)/git instead of $(CACHE_DIR)/gits
Diffstat (limited to 'core')
| -rw-r--r-- | core/deps.mk | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/core/deps.mk b/core/deps.mk index af7fd44..00d96aa 100644 --- a/core/deps.mk +++ b/core/deps.mk @@ -711,18 +711,18 @@ endef ifeq ($(CACHE_DEPS),1) define dep_cache_fetch_git - mkdir -p $(CACHE_DIR)/gits; \ - if test -d "$(join $(CACHE_DIR)/gits/,$(call dep_name,$1))"; then \ - cd $(join $(CACHE_DIR)/gits/,$(call dep_name,$1)); \ + mkdir -p $(CACHE_DIR)/git; \ + if test -d "$(join $(CACHE_DIR)/git/,$(call dep_name,$1))"; then \ + cd $(join $(CACHE_DIR)/git/,$(call dep_name,$1)); \ if ! git checkout -q $(call dep_commit,$1); then \ git remote set-url origin $(call dep_repo,$1) && \ git pull --all && \ git cat-file -e $(call dep_commit,$1) 2>/dev/null; \ fi; \ else \ - git clone -q -n -- $(call dep_repo,$1) $(join $(CACHE_DIR)/gits/,$(call dep_name,$1)); \ + git clone -q -n -- $(call dep_repo,$1) $(join $(CACHE_DIR)/git/,$(call dep_name,$1)); \ fi; \ - git clone -q --branch $(call dep_commit,$1) --single-branch -- $(join $(CACHE_DIR)/gits/,$(call dep_name,$1)) $2 + git clone -q --branch $(call dep_commit,$1) --single-branch -- $(join $(CACHE_DIR)/git/,$(call dep_name,$1)) $2 endef define dep_fetch_git |