From 17eea9ac1db3a2ebbfa698b7d813167bcbaf97a9 Mon Sep 17 00:00:00 2001
From: Virgile Prevosto <virgile.prevosto@m4x.org>
Date: Tue, 27 Jul 2021 13:23:44 +0200
Subject: [PATCH] [analysis-script] more efficient FRAMAC_SHARE definition and
fix typo
---
share/analysis-scripts/template.mk | 6 ++++--
tests/fc_script/oracle/GNUmakefile | 6 ++++--
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/share/analysis-scripts/template.mk b/share/analysis-scripts/template.mk
index ce2c5e0eadc..8c85db2151c 100644
--- a/share/analysis-scripts/template.mk
+++ b/share/analysis-scripts/template.mk
@@ -7,7 +7,9 @@
# an optional include, unnecessary if frama-c is in the PATH.
FRAMAC ?= frama-c # FRAMAC is defined in path.mk when it is included, but the
# user can override it in the command-line.
-FRAMAC_SHARE ?= $(shell $(FRAMAC)-config -print-share-path)
+ifeq ($(FRAMAC_SHARE),)
+ FRAMAC_SHARE := $(shell $(FRAMAC)-config -print-share-path)
+endif
include $(FRAMAC_SHARE)/analysis-scripts/prologue.mk
###############################################################################
@@ -39,5 +41,5 @@ main.parse: \
main.c \
### Epilogue. Do not modify this block. #######################################
-include $(FRAMAC_SHARE)/analysis-scripts/prologue.mk
+include $(FRAMAC_SHARE)/analysis-scripts/epilogue.mk
###############################################################################
diff --git a/tests/fc_script/oracle/GNUmakefile b/tests/fc_script/oracle/GNUmakefile
index d844ccc0701..7ea16dfa446 100644
--- a/tests/fc_script/oracle/GNUmakefile
+++ b/tests/fc_script/oracle/GNUmakefile
@@ -7,7 +7,9 @@
# an optional include, unnecessary if frama-c is in the PATH.
FRAMAC ?= frama-c # FRAMAC is defined in path.mk when it is included, but the
# user can override it in the command-line.
-FRAMAC_SHARE ?= $(shell $(FRAMAC)-config -print-share-path)
+ifeq ($(FRAMAC_SHARE),)
+ FRAMAC_SHARE := $(shell $(FRAMAC)-config -print-share-path)
+endif
include $(FRAMAC_SHARE)/analysis-scripts/prologue.mk
###############################################################################
@@ -46,5 +48,5 @@ fc_script_main.parse: \
../main3.c \
### Epilogue. Do not modify this block. #######################################
-include $(FRAMAC_SHARE)/analysis-scripts/prologue.mk
+include $(FRAMAC_SHARE)/analysis-scripts/epilogue.mk
###############################################################################
--
GitLab