diff --git a/ADSpinnaker.Makefile b/ADSpinnaker.Makefile index 7ffa79b2a11a070d992afb5adbd7ca80b0eb7a06..b19d05751602725ed02ef7b5726dec929d076a80 100644 --- a/ADSpinnaker.Makefile +++ b/ADSpinnaker.Makefile @@ -32,12 +32,12 @@ endif ifneq ($(strip $(ADCORE_DEP_VERSION)),) -ADCore_VERSION=$(ADCORE_DEP_VERSION) +adcore_VERSION=$(ADCORE_DEP_VERSION) endif ifneq ($(strip $(ADGENICAM_DEP_VERSION)),) -ADGenICam_VERSION=$(ADGENICAM_DEP_VERSION) +adgenicam_VERSION=$(ADGENICAM_DEP_VERSION) endif @@ -119,8 +119,8 @@ USR_DBFLAGS += -I . -I .. USR_DBFLAGS += -I $(EPICS_BASE)/db USR_DBFLAGS += -I $(APPDB) -USR_DBFLAGS += -I $(E3_SITEMODS_PATH)/ADCore/$(ADCORE_DEP_VERSION)/db -USR_DBFLAGS += -I $(E3_SITEMODS_PATH)/ADGenICam/$(ADGENICAM_DEP_VERSION)/db +USR_DBFLAGS += -I $(E3_SITEMODS_PATH)/adcore/$(ADCORE_DEP_VERSION)/db +USR_DBFLAGS += -I $(E3_SITEMODS_PATH)/adgenicam/$(ADGENICAM_DEP_VERSION)/db SUBS=$(wildcard $(APPDB)/*.substitutions) TMPS=$(wildcard $(APPDB)/*.template) diff --git a/configure/CONFIG_MODULE b/configure/CONFIG_MODULE index 20672c4732571248a35e9db1999086a003c60681..25bbd98087fc2ff8f4dcdcce9aa5506f28425e9c 100644 --- a/configure/CONFIG_MODULE +++ b/configure/CONFIG_MODULE @@ -15,8 +15,8 @@ ADGENICAM_DEP_VERSION:=1.4.0 # In most case, we don't need to touch the following variables. # -E3_MODULE_NAME:=$(EPICS_MODULE_NAME) -E3_MODULE_SRC_PATH:=ADSpinnaker +E3_MODULE_NAME:=adspinnaker +E3_MODULE_SRC_PATH:=$(EPICS_MODULE_NAME) E3_MODULE_MAKEFILE:=$(EPICS_MODULE_NAME).Makefile