Merge pull request #11 from russellfriesenhahn/fixup_makefile_merge
Fixup for Makefile merge 9466e57ce8
diff --git a/Makefile b/Makefile
index 05afb2f..e180deb 100644
--- a/Makefile
+++ b/Makefile
@@ -24,11 +24,11 @@
ifeq ($(CARAVEL_LITE),1)
CARAVEL_NAME := caravel-lite
CARAVEL_REPO := https://github.com/efabless/caravel-lite
- CARAVEL_COMMIT := main
+ CARAVEL_BRANCH := main
else
CARAVEL_NAME := caravel
CARAVEL_REPO := https://github.com/efabless/caravel
- CARAVEL_COMMIT := master
+ CARAVEL_BRANCH := master
endif
# Install caravel as submodule, (1): submodule, (0): clone
@@ -79,12 +79,12 @@
$(eval CARAVEL_PATH := $(shell realpath --relative-to=$(shell pwd) $(CARAVEL_ROOT)))
@if [ ! -d $(CARAVEL_ROOT) ]; then git submodule add --name $(CARAVEL_NAME) $(CARAVEL_REPO) $(CARAVEL_PATH); fi
@git submodule update --init
- @cd $(CARAVEL_ROOT); git checkout $(CARAVEL_COMMIT)
+ @cd $(CARAVEL_ROOT); git checkout $(CARAVEL_BRANCH)
$(MAKE) simlink
else
@echo "Installing $(CARAVEL_NAME).."
@git clone $(CARAVEL_REPO) $(CARAVEL_ROOT)
- @cd $(CARAVEL_ROOT); git checkout $(CARAVEL_COMMIT)
+ @cd $(CARAVEL_ROOT); git checkout $(CARAVEL_BRANCH)
endif
# Create symbolic links to caravel's main files
