From a7d3dc0711cccfa6cfb3b5284226cf732140c588 Mon Sep 17 00:00:00 2001 From: Jerzy Jamroz Date: Mon, 13 Nov 2023 13:42:19 +0100 Subject: [PATCH] Revert "fix: BASE_3_14 var used instead of the complex evaluation." This reverts commit f29d9e7e30deac5e0b7298fdd09eb5b5f6c2f359. --- evgMrmApp/Db/Makefile | 4 ++-- evrMrmApp/Db/Makefile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/evgMrmApp/Db/Makefile b/evgMrmApp/Db/Makefile index aae915657..b9c6b3160 100644 --- a/evgMrmApp/Db/Makefile +++ b/evgMrmApp/Db/Makefile @@ -31,10 +31,10 @@ DB += cpci-evg-300.db DB += vme-evg230.db DB += vme-evg230-nsls2.db DB += mtca-evm-300.db -ifndef BASE_3_14 +ifeq ($(shell echo "$(BASE) > 3.14" | bc),1) DB += evm-mtca-300.db DB += evm-mtca-300-evr.db -endif # BASE_3_14 +endif ifneq ($(DEVIOCSTATS),) ifeq ($(OS_CLASS), RTEMS) diff --git a/evrMrmApp/Db/Makefile b/evrMrmApp/Db/Makefile index 79ad26b3a..6d5abe30a 100644 --- a/evrMrmApp/Db/Makefile +++ b/evrMrmApp/Db/Makefile @@ -21,7 +21,7 @@ DB += evr-tg-300.db DB += evr-mtca-300.db DB += evr-pcie-300dc.db -ifndef BASE_3_14 +ifeq ($(shell echo "$(BASE) > 3.14" | bc),1) DB += evr-300.db endif