From 8d225f3da0f6f3337c094b2712bcd807c2250cd4 Mon Sep 17 00:00:00 2001 From: Matt Birkholz Date: Sun, 12 Jun 2016 13:51:01 -0700 Subject: [PATCH] doc/configure.ac: Do not override autoconf's htmldir, pdfdir, psdir. --- doc/configure.ac | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/doc/configure.ac b/doc/configure.ac index 99ce1b0ce..1a0324969 100644 --- a/doc/configure.ac +++ b/doc/configure.ac @@ -1,9 +1,9 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT([MIT/GNU Scheme documentation], - [9.2], - [bug-mit-scheme@gnu.org], - [mit-scheme-doc]) + [9.2.1], + [puck@birchwood-abbey.net], + [mit-scheme-pucked-doc]) AC_CONFIG_SRCDIR([ref-manual/scheme.texinfo]) AC_COPYRIGHT( @@ -44,11 +44,9 @@ INST_TARGETS= AC_ARG_ENABLE([html], [AC_HELP_STRING([--enable-html], [generate HTML documentation])]) -if test "${enable_html:-yes}" = "yes"; then - htmldir="${libdir}/mit-scheme-pucked/doc" -elif test "${enable_html}" = "no"; then +if test "${enable_html}" = "no"; then htmldir= -else +elif test "${enable_html:-yes}" != "yes"; then htmldir="${enable_html}" fi test "${htmldir}" = "" || TARGETS="${TARGETS} \$(TARGET_ROOT)/index.html" @@ -57,11 +55,9 @@ AC_SUBST([htmldir]) AC_ARG_ENABLE([pdf], [AC_HELP_STRING([--enable-pdf], [generate PDF documentation])]) -if test "${enable_pdf:-yes}" = "yes"; then - pdfdir="${libdir}/mit-scheme-pucked/doc" -elif test "${enable_pdf}" = "no"; then +if test "${enable_pdf}" = "no"; then pdfdir= -else +elif test "${enable_pdf:-yes}" != "yes"; then pdfdir="${enable_pdf}" fi test "${pdfdir}" = "" || TARGETS="${TARGETS} \$(TARGET_ROOT).pdf" @@ -72,9 +68,7 @@ AC_ARG_ENABLE([ps], [AC_HELP_STRING([--enable-ps], [generate Postscript documentation])]) if test "${enable_ps:-no}" = "no"; then psdir= -elif test "${enable_ps}" = "yes"; then - psdir="${libdir}/mit-scheme-pucked/doc" -else +elif test "${enable_ps}" != "yes"; then psdir="${enable_ps}" fi test "${psdir}" = "" || TARGETS="${TARGETS} \$(TARGET_ROOT).ps" -- 2.25.1