[doc] manuals install

doc/Makefile

@@ -28,7 +28,6 @@ MAKECONFIG_DIR=$(FRAMAC_SRC)/share
 
 include $(FRAMAC_SRC)/share/Makefile.common
 
-DOCDIR ?= "$(DESTDIR)${prefix}/share/doc"
 FRAMAC_DOCDIR ?= $(DOCDIR)/frama-c
 
 .PHONY: .force

ivette/Makefile

@@ -159,9 +159,8 @@ include $(DOME)/template/makefile
 # --- Ivette Installation
 # --------------------------------------------------------------------------
 
-INSTALLDIR?=/usr/local
-BINDIR=$(INSTALLDIR)/bin
-LIBDIR=$(INSTALLDIR)/lib
+BINDIR=$(PREFIX)/bin
+LIBDIR=$(PREFIX)/lib
 
 dist-dir:
 	@echo "Cleaning dist"

opam/opam

@@ -93,7 +93,7 @@ build: [
 
 install: [
   [make "INSTALLDIR=%{prefix}%" "install"]
-  [make "-C" "doc" "install"] {with-doc}
+  [make "PREFIX=%{prefix}%" "-C" "doc" "install"] {with-doc}
 ]
 
 run-test: [

share/Makefile.common

@@ -32,6 +32,18 @@
 
 PLATFORM:=$(shell uname -s)
 
+#############
+# Locations #
+#############
+
+# Note that Dune rules do NOT use these variables.
+# They are used by other Makefiles
+#   - Ivette (PREFIX)
+#   - Manuals (DOCDIR)
+
+PREFIX ?= /usr/local
+DOCDIR ?= $(PREFIX)/share/doc
+
 #############
 # Verbosing #
 #############