From 5f0500bcb08eced031ea8407c27b6a781a3f8bf4 Mon Sep 17 00:00:00 2001
From: Chris Hanson <org/chris-hanson/cph>
Date: Sun, 28 Feb 2016 23:12:04 -0800
Subject: [PATCH] If install-info is available, use it to update the info dir.

---
 doc/configure.ac   | 11 ++++++-----
 doc/make-common.in |  2 ++
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/doc/configure.ac b/doc/configure.ac
index 60675ac4c..bcfaa8cd8 100644
--- a/doc/configure.ac
+++ b/doc/configure.ac
@@ -31,12 +31,13 @@ USA.
 ])
 
 AC_PROG_INSTALL
-AC_PROG_LN_S
-AC_PROG_MAKE_SET
 if test "$(${INSTALL} --help 2> /dev/null | fgrep -e --preserve-timestamps)"
 then
     INSTALL="${INSTALL} --preserve-timestamps"
 fi
+AC_PROG_LN_S
+AC_PROG_MAKE_SET
+AC_CHECK_PROG([INSTALL_INFO_PROG], [install-info], [install-info], [true])
 
 TARGETS=
 INST_TARGETS=
@@ -69,10 +70,10 @@ AC_SUBST([pdfdir])
 
 AC_ARG_ENABLE([ps],
 	[AC_HELP_STRING([--enable-ps], [generate Postscript documentation])])
-if test "${enable_ps:-yes}" = "yes"; then
-    psdir="${libdir}/mit-scheme/doc"
-elif test "${enable_ps}" = "no"; then
+if test "${enable_ps:-no}" = "no"; then
     psdir=
+elif test "${enable_ps}" = "yes"; then
+    psdir="${libdir}/mit-scheme/doc"
 else
     psdir="${enable_ps}"
 fi
diff --git a/doc/make-common.in b/doc/make-common.in
index 95b54596a..5258f35e9 100644
--- a/doc/make-common.in
+++ b/doc/make-common.in
@@ -60,6 +60,7 @@ htmldir = @htmldir@
 pdfdir = @pdfdir@
 psdir = @psdir@
 
+INSTALL_INFO_PROG = @INSTALL_INFO_PROG@
 TARGETS = @TARGETS@
 INST_TARGETS = @INST_TARGETS@
 
@@ -113,6 +114,7 @@ install: install-info-gz $(INST_TARGETS)
 install-info: $(INFO_TARGET)
 	-rm -f $(DESTDIR)$(infodir)/$(INFO_TARGET)*
 	$(INSTALL_DATA) $(INFO_TARGET)* $(DESTDIR)$(infodir)/.
+	$(INSTALL_INFO_PROG) --info-dir $(DESTDIR)$(infodir)/ $(INFO_TARGET)
 
 install-info-gz: install-info
 	gzip -v $(DESTDIR)$(infodir)/$(INFO_TARGET)*
-- 
2.25.1