From ecf30d037caf1dec0a4b46841f4ac633d2971c5d Mon Sep 17 00:00:00 2001 From: Nikolay Orlyuk Date: Sat, 7 Jul 2012 23:36:07 +0300 Subject: [PATCH 2/2] Add man, info and lisp dirs configuring --- scripts/Mmake.vars.in | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/scripts/Mmake.vars.in b/scripts/Mmake.vars.in index e5d782a..c411bbc 100644 --- a/scripts/Mmake.vars.in +++ b/scripts/Mmake.vars.in @@ -691,19 +691,25 @@ else DESTDIR_AND_SLASH=$(DESTDIR)/ endif +# autoconf provided vars prefix = @prefix@ exec_prefix = @exec_prefix@ libdir = @libdir@ +datarootdir = @datarootdir@ +mandir = @mandir@ +infodir = @infodir@ + +# actual vars used for installation INSTALL_PREFIX = $(DESTDIR_AND_SLASH)$(prefix) INSTALL_BINDIR = $(INSTALL_PREFIX)/bin INSTALL_LIBDIR = $(DESTDIR_AND_SLASH)$(libdir)/mercury -INSTALL_INFO_DIR = $(INSTALL_PREFIX)/info +INSTALL_INFO_DIR = $(DESTDIR_AND_SLASH)$(infodir) INSTALL_DVI_DIR = $(INSTALL_LIBDIR)/doc INSTALL_TEXT_DIR = $(INSTALL_LIBDIR)/doc INSTALL_PS_DIR = $(INSTALL_LIBDIR)/doc INSTALL_PDF_DIR = $(INSTALL_LIBDIR)/doc -INSTALL_MAN_DIR = $(INSTALL_PREFIX)/man +INSTALL_MAN_DIR = $(DESTDIR_AND_SLASH)$(mandir) INSTALL_HTML_DIR = $(INSTALL_LIBDIR)/html INSTALL_MDB_DOC_DIR = $(INSTALL_LIBDIR)/mdb INSTALL_ELISP_DIR = $(INSTALL_LIBDIR)/elisp @@ -712,8 +718,8 @@ INSTALL_CGI_DIR = $(DESTDIR_AND_SLASH)@CGIDIR@ FINAL_INSTALL_PREFIX = $(prefix) FINAL_INSTALL_BINDIR = $(FINAL_INSTALL_PREFIX)/bin FINAL_INSTALL_LIBDIR = $(libdir)/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_LIBDIR)/elisp FINAL_INSTALL_CGI_DIR = @CGIDIR@ -- 1.7.10.4