Skip to content
Snippets Groups Projects
Commit e47c5336 authored by Wayne Lewis's avatar Wayne Lewis
Browse files

Add extra variable to store original version number

parent a1323df4
No related branches found
No related tags found
1 merge request!24Require updates for 2021Q1 environment release
# -*- mode: Makefile;-*-
# Update the module version (for numeric versions) with a build number of 0 if none is specified
E3_MODULE_VERSION_ORIG:=$(E3_MODULE_VERSION)
E3_MODULE_VERSION:=$(E3_MODULE_VERSION)$(shell [[ "$(E3_MODULE_VERSION)" =~ ^[0-9]+\.[0-9]+\.[0-9]+$$ ]] && echo +0)
include $(EPICS_BASE)/configure/CONFIG_BASE_VERSION
......
......@@ -15,7 +15,7 @@ git submodule update --remote --merge $@/
endef
define patch_site
patches=$$(ls $(TOP)/patch/Site/$(E3_MODULE_VERSION)-*.p0.patch 2> /dev/null); \
patches=$$(ls $(TOP)/patch/Site/$(E3_MODULE_VERSION_ORIG)-*.p0.patch 2> /dev/null); \
if [ -n "$$patches" ]; then \
for i in $$patches; do \
printf "\nPatching %s with the file : %s\n" "$(E3_MODULE_SRC_PATH)" "$$i"; \
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment