Merge branch 'fix/andre/frama-c-config-no-aliases' into 'master'

[fc-config] no longer use frama-c-config aliases

See merge request frama-c/frama-c!2881

bin/frama-c-script

@@ -88,7 +88,7 @@ DIR="$( cd "$( dirname "$0" )" && pwd )"
 # All scripts called by frama-c-script may rely on FRAMAC_BIN pointing to the
 # directory containing frama-c, frama-c-config and frama-c-script.
 export FRAMAC_BIN="$DIR"
-FRAMAC_SHARE=$("${DIR}/frama-c-config" -share)
+FRAMAC_SHARE=$("${DIR}/frama-c-config" -print-share-path)
 if [ -z ${FRAMAC_SESSION+x} ]; then
     FRAMAC_SESSION="./.frama-c";
 fi

doc/userman/user-start.tex

@@ -257,7 +257,7 @@ content of the file to \texttt{\~{}/.bash\_completion}
 \item You can \texttt{source} the file, e.g. from your \texttt{.bashrc} with
 the following command:
 \begin{verbatim}
-source $(frama-c-config -share)/autocomplete_frama-c || true
+source $(frama-c-config -print-share-path)/autocomplete_frama-c || true
 \end{verbatim}
 \end{itemize}
 

share/analysis-scripts/template.mk

@@ -7,7 +7,7 @@
                  # 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.
-include $(shell $(FRAMAC)-config -scripts)/prologue.mk
+include $(shell $(FRAMAC)-config -print-share-path)/analysis-scripts/prologue.mk
 ###############################################################################
 
 # Edit below as needed. Suggested flags are optional.
@@ -39,5 +39,5 @@ main.parse: \
   main.c \
 
 ### Epilogue. Do not modify this block. #######################################
-include $(shell $(FRAMAC)-config -scripts)/epilogue.mk
+include $(shell $(FRAMAC)-config -print-share-path)/analysis-scripts/epilogue.mk
 ###############################################################################

tests/fc_script/oracle/GNUmakefile

@@ -7,7 +7,7 @@
                  # 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.
-include $(shell $(FRAMAC)-config -scripts)/prologue.mk
+include $(shell $(FRAMAC)-config -print-share-path)/analysis-scripts/prologue.mk
 ###############################################################################
 
 # Edit below as needed. Suggested flags are optional.
@@ -46,5 +46,5 @@ fc_script_main.parse: \
   ../main3.c \
 
 ### Epilogue. Do not modify this block. #######################################
-include $(shell $(FRAMAC)-config -scripts)/epilogue.mk
+include $(shell $(FRAMAC)-config -print-share-path)/analysis-scripts/epilogue.mk
 ###############################################################################