diff --git a/nix/frama-c.nix b/nix/frama-c.nix index 457a9d9c82027a6f191172efa31d0de1706996e3..ac981c7f92d2b247dec972d682a52d2ee7086a9d 100644 --- a/nix/frama-c.nix +++ b/nix/frama-c.nix @@ -110,7 +110,7 @@ stdenvNoCC.mkDerivation rec { ''; installFlags = [ - "INSTALLDIR=$(out)" + "PREFIX=$(out)" ]; # Simpler for our test target diff --git a/nix/internal-tests.nix b/nix/internal-tests.nix index 7b7da8d89acc3962ecf4a7e2bbb02683fe6d1b00..a2454edc35bb1ad1474dcb16bcfe7b514d9a6fc2 100644 --- a/nix/internal-tests.nix +++ b/nix/internal-tests.nix @@ -133,7 +133,7 @@ stdenvNoCC.mkDerivation rec { ''; installFlags = [ - "INSTALLDIR=$(out)" + "PREFIX=$(out)" ]; meta = { diff --git a/nix/mk_plugin.nix b/nix/mk_plugin.nix index c5280b67f10b90d63d1230e1fb55aefbc930da6f..86f1499b69f58016451c24b626b36c636b124ca3 100644 --- a/nix/mk_plugin.nix +++ b/nix/mk_plugin.nix @@ -112,7 +112,7 @@ stdenv.mkDerivation { ''; installFlags = [ - "INSTALLDIR=$(out)" + "PREFIX=$(out)" ]; postInstall = if install-opam then '' diff --git a/opam/opam b/opam/opam index dc071e629a7392ef2ace3b6c12ed2f7d0a5ebd4a..8adf2660e4ad78a695dec57dba8077cad8b0f018 100644 --- a/opam/opam +++ b/opam/opam @@ -92,7 +92,7 @@ build: [ ] install: [ - [make "INSTALLDIR=%{prefix}%" "MANDIR=%{mandir}%" "install"] + [make "PREFIX=%{prefix}%" "MANDIR=%{mandir}%" "install"] [make "PREFIX=%{prefix}%" "-C" "doc" "install"] {with-doc} ] diff --git a/share/Makefile.installation b/share/Makefile.installation index 544db518ed7639961ac7944fb2ec81f6303c366b..4bbbeae51be9f6287aee61d8eb4e32626b7728c1 100644 --- a/share/Makefile.installation +++ b/share/Makefile.installation @@ -29,7 +29,7 @@ help:: @echo "Installation configuration variables" - @echo " - INSTALLDIR: used to customize installation path" + @echo " - PREFIX: used to customize installation path" @echo " - MANDIR: used to customize man files installation path" ################################ @@ -37,11 +37,11 @@ help:: # Set this variable to request a specific installation directory # Default: Dune installs in the Opam directory -INSTALLDIR?= +PREFIX?= # Set this variable to request a specific man installation directory # Default: the manuals are installed in the installation directory transmitted -# to Dune (so either in Opam or in INSTALLDIR) +# to Dune (so either in Opam or in PREFIX) MANDIR?= ifeq (${MANDIR},) @@ -56,19 +56,19 @@ endif .PHONY: install uninstall install: -ifeq ($(INSTALLDIR),) +ifeq ($(PREFIX),) dune install ${MANDIR_OPT} else - @echo "Installing to prefix: ${INSTALLDIR}" - dune install --prefix ${INSTALLDIR} ${MANDIR_OPT} + @echo "Installing to prefix: ${PREFIX}" + dune install --prefix ${PREFIX} ${MANDIR_OPT} @echo 'DO NOT FORGET TO EXPAND YOUR OCAMLPATH VARIABLE:' - @echo ' export OCAMLPATH="${INSTALLDIR}/lib:$$OCAMLPATH"' + @echo ' export OCAMLPATH="${PREFIX}/lib:$$OCAMLPATH"' endif uninstall: -ifeq ($(INSTALLDIR),) +ifeq ($(PREFIX),) dune uninstall ${MANDIR_OPT} else - @echo "Uninstalling from prefix: ${INSTALLDIR}" - dune uninstall --prefix ${INSTALLDIR} ${MANDIR_OPT} + @echo "Uninstalling from prefix: ${PREFIX}" + dune uninstall --prefix ${PREFIX} ${MANDIR_OPT} endif