If install-info is available, use it to update the info dir.

diff --git a/doc/configure.ac b/doc/configure.ac
index 60675ac4c17cbd8ac1ece9ccb2ae6f19bcd5f563..bcfaa8cd82a8d7536a96e0005d530a45bacaf89a 100644 (file)
--- 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 95b54596ae3e5ac544d20f87daf38a75bc207532..5258f35e9fb5d55bba224f92c167ce7475fcf2b1 100644 (file)
--- 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)*