From db11826dabc2ee7089fd20486956c05910ac7fa5 Mon Sep 17 00:00:00 2001
From: Julien Signoles <julien.signoles@cea.fr>
Date: Wed, 8 Oct 2014 17:04:13 +0200
Subject: [PATCH] frama-c-config in Makefile.in + gitignore

---
 src/plugins/e-acsl/.gitignore      | 1 +
 src/plugins/e-acsl/Makefile.in     | 4 ++--
 src/plugins/e-acsl/demo/.gitignore | 4 ++++
 3 files changed, 7 insertions(+), 2 deletions(-)
 create mode 100644 src/plugins/e-acsl/demo/.gitignore

diff --git a/src/plugins/e-acsl/.gitignore b/src/plugins/e-acsl/.gitignore
index d7240f5a424..23c3796e8f4 100644
--- a/src/plugins/e-acsl/.gitignore
+++ b/src/plugins/e-acsl/.gitignore
@@ -75,3 +75,4 @@
 /tests/e-acsl-reject/result/*_DEP
 /tests/e-acsl-reject/result/*.log
 /tests/check/obj/*
+.frama-c
diff --git a/src/plugins/e-acsl/Makefile.in b/src/plugins/e-acsl/Makefile.in
index ccd74022b81..cbbeefb46ea 100644
--- a/src/plugins/e-acsl/Makefile.in
+++ b/src/plugins/e-acsl/Makefile.in
@@ -27,10 +27,10 @@
 # Do not use ?= to initialize both below variables
 # (fixed efficiency issue, see GNU Make manual, Section 8.11)
 ifndef FRAMAC_SHARE
-FRAMAC_SHARE  :=$(shell frama-c -journal-disable -print-path)
+FRAMAC_SHARE  :=$(shell frama-c-config -print-share-path)
 endif
 ifndef FRAMAC_LIBDIR
-FRAMAC_LIBDIR :=$(shell frama-c -journal-disable -print-libpath)
+FRAMAC_LIBDIR :=$(shell frama-c-config -print-libpath)
 endif
 
 # OCAMLVERSION and HAS_OCAML312 are defined in Frama-C common Makefile but
diff --git a/src/plugins/e-acsl/demo/.gitignore b/src/plugins/e-acsl/demo/.gitignore
new file mode 100644
index 00000000000..50f382630b5
--- /dev/null
+++ b/src/plugins/e-acsl/demo/.gitignore
@@ -0,0 +1,4 @@
+demo
+demo.sav
+script
+res_demo.c
-- 
GitLab