From 3ea23f8a2e765a3df0e2cc8435635609257964b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lucas=20Magalh=C3=A3es?= <lucas.magalhaes@ess.eu> Date: Thu, 26 Jan 2023 13:43:06 +0000 Subject: [PATCH] Replace instances of REQUIRE_CONFIG with E3_REQUIRE_CONFIG, and remove DECOUPLE_FLAGS (Autogenerated commit) [skip ci] --- asyn.Makefile | 2 +- configure/CONFIG | 4 ++-- configure/RULES | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/asyn.Makefile b/asyn.Makefile index c19f1c4..e6f903b 100644 --- a/asyn.Makefile +++ b/asyn.Makefile @@ -2,7 +2,7 @@ LEGACY_RSET = YES where_am_I := $(dir $(abspath $(lastword $(MAKEFILE_LIST)))) include $(E3_REQUIRE_TOOLS)/driver.makefile -include $(E3_REQUIRE_CONFIG)/DECOUPLE_FLAGS + ASYN = asyn diff --git a/configure/CONFIG b/configure/CONFIG index 2b63d79..8772be7 100644 --- a/configure/CONFIG +++ b/configure/CONFIG @@ -14,7 +14,7 @@ include $(TOP)/configure/CONFIG_MODULE endif E3_REQUIRE_LOCATION := $(EPICS_BASE)/$(E3_REQUIRE_NAME)/$(E3_REQUIRE_VERSION) -REQUIRE_CONFIG := $(E3_REQUIRE_LOCATION)/configure -include $(REQUIRE_CONFIG)/CONFIG + +include $(E3_REQUIRE_LOCATION)/configure/CONFIG diff --git a/configure/RULES b/configure/RULES index 978c976..96cc1d1 100644 --- a/configure/RULES +++ b/configure/RULES @@ -1,5 +1,5 @@ -include $(REQUIRE_CONFIG)/RULES_SITEMODS +include $(E3_REQUIRE_CONFIG)/RULES_SITEMODS include $(TOP)/configure/module/RULES_MODULE -include $(TOP)/configure/module/RULES_DKMS_L -- GitLab