From b7da2c46a9d8065e64f2f92b7e14e7c3c4bcce49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Loi=CC=88c=20Correnson?= <loic.correnson@cea.fr> Date: Tue, 11 Oct 2022 08:00:50 +0200 Subject: [PATCH] [ivette] make install fixes --- ivette/ivette-opam.sh | 6 +++++- ivette/makefile.opam | 14 ++++++++------ 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/ivette/ivette-opam.sh b/ivette/ivette-opam.sh index da24175d949..d358c807e54 100755 --- a/ivette/ivette-opam.sh +++ b/ivette/ivette-opam.sh @@ -21,6 +21,10 @@ # # ########################################################################## +# -------------------------------------------------------------------------- +# --- Ivette bootstrapper for OPAM installation +# -------------------------------------------------------------------------- + echo "Building Ivette" PWD=`pwd` @@ -55,7 +59,7 @@ fi echo "[2/3] Compiling Ivette" # -------------------------------------------------------------------------- -TMPDIR=`mktemp -d -t ivette` +TMPDIR=`mktemp -d` cd $TMPDIR tar zxf $PREFIX/lib/frama-c/ivette.tgz cd ivette diff --git a/ivette/makefile.opam b/ivette/makefile.opam index fee44db5e7a..3739c68ef08 100644 --- a/ivette/makefile.opam +++ b/ivette/makefile.opam @@ -27,15 +27,17 @@ .PHONY: install uninstall install: - @echo "Installing Ivette (OPAM)" - mkdir -p $(PREFIX)/bin - install ivette/ivette-opam.sh $(PREFIX)/bin/ivette - mkdir -p $(PREFIX)/lib/frama-c - tar zcf $(PREFIX)/lib/frama-c/ivette.tgz ivette + @echo "Installing Ivette…" + @mkdir -p $(PREFIX)/bin + @install ivette/ivette-opam.sh $(PREFIX)/bin/ivette + @mkdir -p $(PREFIX)/lib/frama-c + @tar zcf $(PREFIX)/lib/frama-c/ivette.tgz ivette + @echo "Done" uninstall: - @echo "Removing Ivette" + @echo "Removing Ivette…" @rm -f $(PREFIX)/bin/ivette @rm -f $(PREFIX)/lib/frama-c/ivette.tgz @rm -fr $(PREFIX)/lib/ivette # linux @rm -fr /Applications/Ivette.app # macOS + @echo "Done" -- GitLab