[m-rev.] diff: Install documentation into paths selected by ./configure

[Paul Bone]

Install documentation into paths selected by ./configure

Install the documentation, including info and man pages but not the mdb
docs, into the paths selected by ./configure.  This also makes Mercury more
up-to-date with respect to Linux Distros' file locations, using share/doc/
rather than doc/

Doing the same for other files, such as binaries, libraries and the mdb
documentation, requires more working with autoconf than I'm happy to do
right now.

scripts/Mmake.vars.in:
    As above.
---
 scripts/Mmake.vars.in | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/scripts/Mmake.vars.in b/scripts/Mmake.vars.in
index b3b29bc..d4196db 100644
--- a/scripts/Mmake.vars.in
+++ b/scripts/Mmake.vars.in
@@ -634,16 +634,21 @@ else
     DESTDIR_AND_SLASH = $(DESTDIR)/
 endif
 
+# Handle some autoconf weirdness, it relies on these variables but doesn't
+# define them.
+prefix=@prefix@
+PACKAGE=mercury-$(VERSION)
+
 INSTALL_PREFIX		= $(DESTDIR_AND_SLASH)@prefix@
 INSTALL_BINDIR		= $(INSTALL_PREFIX)/bin
 INSTALL_LIBDIR		= $(INSTALL_PREFIX)/lib/mercury
-INSTALL_INFO_DIR	= $(INSTALL_PREFIX)/info
-INSTALL_DVI_DIR		= $(INSTALL_PREFIX)/lib/mercury/doc
-INSTALL_TEXT_DIR	= $(INSTALL_PREFIX)/lib/mercury/doc
-INSTALL_PS_DIR		= $(INSTALL_PREFIX)/lib/mercury/doc
-INSTALL_PDF_DIR		= $(INSTALL_PREFIX)/lib/mercury/doc
-INSTALL_MAN_DIR		= $(INSTALL_PREFIX)/man
-INSTALL_HTML_DIR	= $(INSTALL_PREFIX)/lib/mercury/html
+INSTALL_INFO_DIR	= $(DESTDIR_AND_SLASH)@infodir@
+INSTALL_DVI_DIR		= $(DESTDIR_AND_SLASH)@docdir@
+INSTALL_TEXT_DIR	= $(DESTDIR_AND_SLASH)@docdir@
+INSTALL_PS_DIR		= $(DESTDIR_AND_SLASH)@docdir@
+INSTALL_PDF_DIR		= $(DESTDIR_AND_SLASH)@docdir@
+INSTALL_MAN_DIR		= $(DESTDIR_AND_SLASH)@mandir@
+INSTALL_HTML_DIR	= $(DESTDIR_AND_SLASH)@docdir@
 INSTALL_MDB_DOC_DIR	= $(INSTALL_PREFIX)/lib/mercury/mdb
 INSTALL_ELISP_DIR	= $(INSTALL_PREFIX)/lib/mercury/elisp
 INSTALL_CGI_DIR		= $(DESTDIR_AND_SLASH)@CGIDIR@
@@ -651,8 +656,8 @@ INSTALL_CGI_DIR		= $(DESTDIR_AND_SLASH)@CGIDIR@
 FINAL_INSTALL_PREFIX	= @prefix@
 FINAL_INSTALL_BINDIR 	= $(FINAL_INSTALL_PREFIX)/bin
 FINAL_INSTALL_LIBDIR	= $(FINAL_INSTALL_PREFIX)/lib/mercury
-FINAL_INSTALL_INFO_DIR	= $(FINAL_INSTALL_PREFIX)/info
-FINAL_INSTALL_MAN_DIR	= $(FINAL_INSTALL_PREFIX)/man
+FINAL_INSTALL_INFO_DIR	= @infodir@
+FINAL_INSTALL_MAN_DIR	= @mandir@
 FINAL_INSTALL_ELISP_DIR	= $(FINAL_INSTALL_PREFIX)/lib/mercury/elisp
 FINAL_INSTALL_CGI_DIR	= @CGIDIR@
 
-- 
2.7.4