From b77fe29a1e99a37a00dc15faa0a32aba343594bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Loi=CC=88c=20Correnson?= <loic.correnson@cea.fr>
Date: Tue, 18 Oct 2022 17:53:16 +0200
Subject: [PATCH] [ivette] conforms to global make install
---
ivette/Makefile.installation | 30 +++++++++++-------------------
opam | 2 +-
2 files changed, 12 insertions(+), 20 deletions(-)
diff --git a/ivette/Makefile.installation b/ivette/Makefile.installation
index 852e0a56588..7a69ff94f9c 100644
--- a/ivette/Makefile.installation
+++ b/ivette/Makefile.installation
@@ -24,32 +24,24 @@
# --- OPAM Installation
# --------------------------------------------------------------------------
-ifeq ($(INSTALLDIR),)
-IVETTE_PREFIX=$(OPAM_SWITCH_PREFIX)
-else
-IVETTE_PREFIX=$(INSTALLDIR)
-endif
-
-ifeq ($(IVETTE_PREFIX),)
-
+ifndef PREFIX
+then
install::
@echo "Warning: not target for Ivette"
@echo " (no INSTALLDIR, nor OPAM_SWITCH_PREFIX)"
-
else
-
install::
- @echo "Installing Ivette to ${IVETTE_PREFIX}"
- @mkdir -p ${IVETTE_PREFIX}/bin
- @install ivette/ivette-bootstrap.sh ${IVETTE_PREFIX}/bin/ivette
- @mkdir -p ${IVETTE_PREFIX}/lib/frama-c
- @tar zcf ${IVETTE_PREFIX}/lib/frama-c/ivette.tgz ivette
+ @echo "Installing Ivette to ${PREFIX}"
+ @mkdir -p ${PREFIX}/bin
+ @install ivette/ivette-bootstrap.sh ${PREFIX}/bin/ivette
+ @mkdir -p ${PREFIX}/lib/frama-c
+ @tar zcf ${PREFIX}/lib/frama-c/ivette.tgz ivette
uninstall::
@echo "Removing Ivette"
- @rm -f ${IVETTE_PREFIX}/bin/ivette
- @rm -f ${IVETTE_PREFIX}/lib/frama-c/ivette.tgz
- @rm -fr ${IVETTE_PREFIX}/lib/frama-c/Ivette.app
- @rm -fr ${IVETTE_PREFIX}/lib/frama-c/ivette
+ @rm -f ${PREFIX}/bin/ivette
+ @rm -f ${PREFIX}/lib/frama-c/ivette.tgz
+ @rm -fr ${PREFIX}/lib/frama-c/Ivette.app
+ @rm -fr ${PREFIX}/lib/frama-c/ivette
endif
diff --git a/opam b/opam
index 274e43adb66..66652917748 100644
--- a/opam
+++ b/opam
@@ -97,7 +97,7 @@ install: [
]
remove: [
- [make "PREFIX=%{prefix}%" "-f" "ivette/makefile.opam" "uninstall"]
+ [make "PREFIX=%{prefix}%" "-f" "ivette/Makefile.installation" "uninstall"]
]
run-test: [
--
GitLab