From 3181fe5407ed0221714830e2bd1e19850eac5461 Mon Sep 17 00:00:00 2001
From: Cyril SIX <cyril.six@kalray.eu>
Date: Tue, 1 Jun 2021 18:28:11 +0200
Subject: Remove install path bricolage for kvx

---
 INSTALL.md | 7 +++++--
 configure  | 2 --
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/INSTALL.md b/INSTALL.md
index e80fb600..f072a211 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -44,8 +44,11 @@ opam pin add coq 8.11.0 # example of Coq version
 Pre-compilation configure replace the placeholder with your desired platform
 (for Kalray Coolidge it is `kvx-cos`)
 ```
-./configure <platform>
+./configure -prefix ~/.usr <platform>
 ```
+
+`PREFIX` is where CompCert will be installed after `make install`
+
 If using Kalray's platform, make sure that the kvx tools are on your path
 Compile (adapt -j# to the number of cores and available RAM)
 ```
@@ -54,7 +57,7 @@ make install
 ```
 
 ## Utilization
-`ccomp` binaries are installed at `$(HOME)/.usr/bin`
+`ccomp` binaries are installed at `$(PREFIX)/bin`
 Make sure to add that to your path to ease its use
 Now you may use it like a regular compiler
 ```
diff --git a/configure b/configure
index 7467e80a..ae3a7c00 100755
--- a/configure
+++ b/configure
@@ -431,8 +431,6 @@ if test "$arch" = "kvx"; then
   casm_options="$model_options"
   cc="$k1base-gcc $model_options"
   clinker="$k1base-gcc"
-  bindir="$HOME/.usr/bin"
-  libdir="$HOME/.usr/lib"
   clinker_options="$model_options -L$libdir -Wl,-rpath=$libdir"
   cprepro="$k1base-gcc"
   cprepro_options="$model_options -D __KVX_${osupper}__ -std=c99 -E -include ccomp_kvx_fixes.h"
-- 
cgit