Update Makefile

Makefile

@@ -23,9 +23,9 @@ MODELS := $(MODELS:%=models/%)
 MODULES := $(MODULES:%=modules/%)
 ALL_PKGS := $(BASE) $(MODULES) $(MODELS)
 
-BASE_I := $(BASE:%=.install/%)
-MODELS_I := $(MODELS:%=.install/%)
-MODULES_I := $(MODULES:%=.install/%)
+BASE_I := $(%=.install/%)
+MODELS_I := $(%=.install/%)
+MODULES_I := $(%=.install/%)
 ALL_PKGS_I := $(BASE_I) $(MODULES_I) $(MODELS_I)
 SHINY_I := $(SHINY:shiny/%=.shiny_depends/%)
 
@@ -74,7 +74,7 @@ depends_R_pkg = ./scripts/time.sh "depends ${1}" ./scripts/confirm_deps.R ${1} \
 	$(if $(findstring modules/benchmark,$(1)),NA,TRUE)
 install_R_pkg = ./scripts/time.sh "install ${1}" Rscript \
 	-e ${SETROPTIONS} \
-        -e "install.packages('PEcAn.$(1)', repos = c('https://pecanproject.r-universe.dev', 'https://cloud.r-project.org'))"
+        -e "install.packages('PEcAn.$(strip $(1))', repos = c('https://pecanproject.r-universe.dev', 'https://cloud.r-project.org'))"
 check_R_pkg = ./scripts/time.sh "check ${1}" Rscript scripts/check_with_errors.R $(strip $(1))
 test_R_pkg = ./scripts/time.sh "test ${1}" Rscript \
 	-e "devtools::test('$(strip $(1))'," \