Merge pull request #50 from ZLLentz/fix-build

FIX: fix the build for a new bugfix release
pcdshub · Jun 9, 2020 · 58bd349 · 58bd349
2 parents cd19ece + 4d247d8
commit 58bd349
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/app/Db/EthercatMC.template b/app/Db/EthercatMC.template
@@ -24,7 +24,7 @@ record(motor,"$(PREFIX)$(MOTOR_NAME)")
     field(RDBD,"$(RDBD=0)")
     field(RMOD,"$(RMOD=3)")
     field(RTRY,"$(RTRY=1)")
-    field(SPDB,"$(SPDB=0)")
+    field(SPDB,"$(SPDB=0.0001)")
     field(TWV,"$(TWV=1)")
     field(VBAS,"$(VBAS=0)")
     field(VELO,"$(VELO=0)")

diff --git a/app/Db/Makefile b/app/Db/Makefile
@@ -18,13 +18,13 @@ include $(TOP)/configure/CONFIG
 ARCHIVE +=
 REQ +=
 
-DB_INSTALLS += EthercatMC.template
-DB_INSTALLS += EthercatMCdebug.template
-DB_INSTALLS += EthercatMChome.template
-DB_INSTALLS += EthercatMCreadback.template
-DB_INSTALLS += EthercatMCslitAvoidCollSoftlimits.template
-DB_INSTALLS += EthercatMCslit_hard.template
-DB_INSTALLS += EthercatMCslit_soft.template
+DB += EthercatMC.template
+DB += EthercatMCdebug.template
+DB += EthercatMChome.template
+DB += EthercatMCreadback.template
+DB += EthercatMCslitAvoidCollSoftlimits.template
+DB += EthercatMCslit_hard.template
+DB += EthercatMCslit_soft.template
 
 DB_INSTALLS += $(IOCADMIN)/db/iocSoft.db
 DB_INSTALLS += $(IOCADMIN)/db/devIocInfo.db

diff --git a/iocBoot/templates/Makefile.base b/iocBoot/templates/Makefile.base
@@ -34,7 +34,7 @@ DB_PARAMETERS ?= 'PREFIX=$(PREFIX):,IOCNAME=$$(IOCNAME)'
 # abspath is failing with spaces - falling back to Python here:
 pyabspath = $(shell python -c "import os, sys; print(os.path.abspath(os.path.expanduser(sys.argv[1])))" "$(1)" )
 
-all: build clean
+all: build paths clean
 
 help:
 	@echo "Available commands:"