Skip to content

Commit 24060bd

Browse files
Remove unnecessary question marks
These were put it to allow various environment variable overrides in CI, but since then we've changed the mechanism to just directly write into the Makefiles as appropriate. Keeping the question mark in configure/RELEASE causes the dls-release.py script to fail to correctly replace the value when we request an override (when specifying an EPICS version with -e)
1 parent c2d6444 commit 24060bd

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

configure/CONFIG_SITE

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ CROSS_COMPILER_TARGET_ARCHS += linux-arm_elhf
1616

1717
# This can either be an explicit path to the directory containing the
1818
# epicsdbbuilder module or a version number understood by pkg_resources.require
19-
EPICSDBBUILDER ?= /dls_sw/prod/python3/RHEL7-x86_64/epicsdbbuilder/1.5
19+
EPICSDBBUILDER = /dls_sw/prod/python3/RHEL7-x86_64/epicsdbbuilder/1.5
2020

21-
SPHINXBUILD ?= /dls_sw/prod/python3/RHEL7-x86_64/sphinx/2.3.1/prefix/bin/sphinx-build
21+
SPHINXBUILD = /dls_sw/prod/python3/RHEL7-x86_64/sphinx/2.3.1/prefix/bin/sphinx-build
2222

23-
PYTHON ?= python
23+
PYTHON = python
2424

2525
# vim: set filetype=make:

configure/RELEASE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@
2222

2323
# EPICS_BASE usually appears last so other apps can override stuff.
2424
# Point this to the EPICS installation.
25-
EPICS_BASE ?= /dls_sw/epics/R3.14.12.7/base
25+
EPICS_BASE = /dls_sw/epics/R3.14.12.7/base

0 commit comments

Comments
 (0)