plugins: Use MIT_SCHEME_EXE for "toolchain". Fix Makefile merges.

diff --git a/src/blowfish/Makefile.am b/src/blowfish/Makefile.am
index 13d76995436eb02c8d4d19db76093a98ebfe4e3a..f168b314372fac8edd6c8f2dcf8a660053995129 100644 (file)
--- a/src/blowfish/Makefile.am
+++ b/src/blowfish/Makefile.am
@@ -98,7 +98,7 @@ install-data-hook:
        ( echo '(add-plugin "blowfish" "@MIT_SCHEME_PROJECT@"'; \
          echo '            "$(DESTDIR)$(infodir)"'; \
          echo '            "$(DESTDIR)$(scmlibdir)"'; \
-         echo '            "")' ) \
+         echo '            "$(DESTDIR)$(scmdocdir)")' ) \
        | $(MIT_SCHEME_EXE) --batch-mode
 
 install-html: install-html-am
@@ -108,6 +108,10 @@ install-html: install-html-am
          echo '            "$(DESTDIR)$(scmdocdir)")' ) \
        | $(MIT_SCHEME_EXE) --batch-mode
 
+install-info-am:
+
+uninstall-info-am:
+
 uninstall-hook:
        ( echo '(remove-plugin "blowfish" "@MIT_SCHEME_PROJECT@"'; \
          echo '               "$(DESTDIR)$(infodir)"'; \

diff --git a/src/blowfish/configure.ac b/src/blowfish/configure.ac
index b497f3541bcc4eeca3296d7976260ca89ccc6714..21553d7aa37ea767674f16cfeb02d2e9ef08c407 100644 (file)
--- a/src/blowfish/configure.ac
+++ b/src/blowfish/configure.ac
@@ -139,7 +139,7 @@ if test "${with_openssl}" != no; then
 fi
 
 MIT_SCHEME_PROJECT=mit-scheme-pucked
-: ${MIT_SCHEME_TOOLCHAIN_EXE=mit-scheme}
+: ${MIT_SCHEME_TOOLCHAIN_EXE=${MIT_SCHEME_EXE=mit-scheme}}
 if test x"${MIT_SCHEME_LIBDIR}" = x; then
     MIT_SCHEME_LIBDIR=`( echo "(display (->namestring" ;\
                         echo "          (system-library-directory-pathname)))" ) \
@@ -182,9 +182,6 @@ done
 MIT_SCHEME_DEPS="${MIT_SCHEME_DEPS}
 ${MIT_SCHEME_PKD}: stamp-scheme"
 
-# Install plugin docs in Scheme's docdir.
-docdir='$(datarootdir)/doc/$(MIT_SCHEME_PROJECT)'
-
 AC_SUBST([MIT_SCHEME_PROJECT])
 AC_SUBST([MIT_SCHEME_TOOLCHAIN_EXE])
 AC_SUBST([MIT_CFLAGS])

diff --git a/src/edwin/configure.ac b/src/edwin/configure.ac
index 29482bfb3cfcdcb2516abed4006a94766b3ce942..1885562903a9ae4323519d17567dc08fbbf0d60d 100644 (file)
--- a/src/edwin/configure.ac
+++ b/src/edwin/configure.ac
@@ -47,7 +47,7 @@ AM_INIT_AUTOMAKE
 AC_PROG_INSTALL
 
 MIT_SCHEME_PROJECT=mit-scheme-pucked
-: ${MIT_SCHEME_TOOLCHAIN_EXE=mit-scheme}
+: ${MIT_SCHEME_TOOLCHAIN_EXE=${MIT_SCHEME_EXE=mit-scheme}}
 if test x"${MIT_SCHEME_LIBDIR}" = x; then
     MIT_SCHEME_LIBDIR=`( echo "(display (->namestring" ;\
                         echo "          (system-library-directory-pathname)))" ) \

diff --git a/src/gdbm/Makefile.am b/src/gdbm/Makefile.am
index b0ab3bf7654e5463be9d2cf97e7bdf3bede06d6b..2ac5c2c30d4d4b48748147962fe0af243397b697 100644 (file)
--- a/src/gdbm/Makefile.am
+++ b/src/gdbm/Makefile.am
@@ -98,18 +98,20 @@ install-data-hook:
        ( echo '(add-plugin "gdbm" "@MIT_SCHEME_PROJECT@"'; \
          echo '            "$(DESTDIR)$(infodir)"'; \
          echo '            "$(DESTDIR)$(scmlibdir)"'; \
-         echo '            "")' ) \
+         echo '            "$(DESTDIR)$(scmdocdir)")' ) \
        | $(MIT_SCHEME_EXE) --batch-mode
 
 install-html: install-html-am
        ( echo '(add-plugin "gdbm" "@MIT_SCHEME_PROJECT@"'; \
          echo '            "$(DESTDIR)$(infodir)"'; \
          echo '            "$(DESTDIR)$(scmlibdir)"'; \
-         echo '            ""'; \
-         echo '            ""'; \
          echo '            "$(DESTDIR)$(scmdocdir)")' ) \
        | $(MIT_SCHEME_EXE) --batch-mode
 
+install-info-am:
+
+uninstall-info-am:
+
 uninstall-hook:
        ( echo '(remove-plugin "gdbm" "@MIT_SCHEME_PROJECT@"'; \
          echo '               "$(DESTDIR)$(infodir)"'; \

diff --git a/src/gdbm/configure.ac b/src/gdbm/configure.ac
index cd7fd419be79b522f4b7e875e0295dbefbfa459d..d8c673dae18d3d0ea2fb961b3c6b7a5827e126ea 100644 (file)
--- a/src/gdbm/configure.ac
+++ b/src/gdbm/configure.ac
@@ -90,7 +90,7 @@ AC_CHECK_HEADER([gdbm.h],[],[
 LIBS="-lgdbm"
 
 MIT_SCHEME_PROJECT=mit-scheme-pucked
-: ${MIT_SCHEME_TOOLCHAIN_EXE=mit-scheme}
+: ${MIT_SCHEME_TOOLCHAIN_EXE=${MIT_SCHEME_EXE=mit-scheme}}
 if test x"${MIT_SCHEME_LIBDIR}" = x; then
     MIT_SCHEME_LIBDIR=`( echo "(display (->namestring" ;\
                         echo "          (system-library-directory-pathname)))" ) \
@@ -133,9 +133,6 @@ done
 MIT_SCHEME_DEPS="${MIT_SCHEME_DEPS}
 ${MIT_SCHEME_PKD}: stamp-scheme"
 
-# Install plugin docs in Scheme's docdir.
-docdir='$(datarootdir)/doc/$(MIT_SCHEME_PROJECT)'
-
 AC_SUBST([MIT_SCHEME_PROJECT])
 AC_SUBST([MIT_CFLAGS])
 AC_SUBST([MIT_SCHEME_TOOLCHAIN_EXE])

diff --git a/src/imail/Makefile.am b/src/imail/Makefile.am
index 6d8d58efa7c92019bb9a35b380c0d59797896fac..1197310827fc0b38108442b3a9c5bfd3158d533a 100644 (file)
--- a/src/imail/Makefile.am
+++ b/src/imail/Makefile.am
@@ -108,6 +108,10 @@ install-html: install-html-am
          echo '            "$(DESTDIR)$(scmdocdir)")' ) \
        | $(MIT_SCHEME_EXE) --batch-mode
 
+install-info-am:
+
+uninstall-info-am:
+
 uninstall-hook:
        ( echo '(remove-plugin "imail" "@MIT_SCHEME_PROJECT@"'; \
          echo '               "$(DESTDIR)$(infodir)"'; \

diff --git a/src/imail/configure.ac b/src/imail/configure.ac
index 78d26a9cbf7f7c224d390dd2ad0d2eae5e99a8d3..c3fa84426e1a4db1bf10f905ee410f21f2eb6828 100644 (file)
--- a/src/imail/configure.ac
+++ b/src/imail/configure.ac
@@ -47,7 +47,7 @@ AM_INIT_AUTOMAKE
 AC_PROG_INSTALL
 
 MIT_SCHEME_PROJECT=mit-scheme-pucked
-: ${MIT_SCHEME_TOOLCHAIN_EXE=mit-scheme}
+: ${MIT_SCHEME_TOOLCHAIN_EXE=${MIT_SCHEME_EXE=mit-scheme}}
 if test x"${MIT_SCHEME_LIBDIR}" = x; then
     MIT_SCHEME_LIBDIR=`( echo "(display (->namestring" ;\
                         echo "          (system-library-directory-pathname)))" ) \
@@ -58,9 +58,6 @@ if test x"${MIT_SCHEME_OS_SUFFIX}" = x; then
                           | ${MIT_SCHEME_TOOLCHAIN_EXE} --batch-mode`
 fi
 
-# Install plugin docs in Scheme's docdir.
-docdir='$(datarootdir)/doc/$(MIT_SCHEME_PROJECT)'
-
 AC_SUBST([MIT_SCHEME_PROJECT])
 AC_SUBST([MIT_SCHEME_TOOLCHAIN_EXE])
 AC_SUBST([MIT_SCHEME_LIBDIR])

diff --git a/src/mcrypt/configure.ac b/src/mcrypt/configure.ac
index 1ad68068012aea20cc41469eda2e18c844644d93..46b4c896ec3466ebd2c95b6954021a20898e1adf 100644 (file)
--- a/src/mcrypt/configure.ac
+++ b/src/mcrypt/configure.ac
@@ -124,7 +124,7 @@ CFLAGS="${MCRYPT_CFLAGS} ${CFLAGS}"
 LIBS="${LIBS} ${MCRYPT_LIBS}"
 
 MIT_SCHEME_PROJECT=mit-scheme-pucked
-: ${MIT_SCHEME_TOOLCHAIN_EXE=mit-scheme}
+: ${MIT_SCHEME_TOOLCHAIN_EXE=${MIT_SCHEME_EXE=mit-scheme}}
 if test x"${MIT_SCHEME_LIBDIR}" = x; then
     MIT_SCHEME_LIBDIR=`( echo "(display (->namestring" ;\
                         echo "          (system-library-directory-pathname)))" ) \

diff --git a/src/pgsql/configure.ac b/src/pgsql/configure.ac
index d34eccad8ba1acd747e5086a2a372d6569ea2865..be2e7059b6f2cb9a75f1a104fe9e4f1466a98aef 100644 (file)
--- a/src/pgsql/configure.ac
+++ b/src/pgsql/configure.ac
@@ -125,7 +125,7 @@ AC_DEFINE([HAVE_LIBPQ_FE_H], [1],
          [Define to 1 if you have the <libpq-fe.h> header file.])
 
 MIT_SCHEME_PROJECT=mit-scheme-pucked
-: ${MIT_SCHEME_TOOLCHAIN_EXE=mit-scheme}
+: ${MIT_SCHEME_TOOLCHAIN_EXE=${MIT_SCHEME_EXE=mit-scheme}}
 if test x"${MIT_SCHEME_LIBDIR}" = x; then
     MIT_SCHEME_LIBDIR=`( echo "(display (->namestring" ;\
                         echo "          (system-library-directory-pathname)))" ) \

diff --git a/src/x11-screen/configure.ac b/src/x11-screen/configure.ac
index b213fbfc27576b96a5f95afba2b1909cc1d1415d..90bad0dac356809b7169dcfa440803849a973c29 100644 (file)
--- a/src/x11-screen/configure.ac
+++ b/src/x11-screen/configure.ac
@@ -47,7 +47,7 @@ AM_INIT_AUTOMAKE
 AC_PROG_INSTALL
 
 MIT_SCHEME_PROJECT=mit-scheme-pucked
-: ${MIT_SCHEME_TOOLCHAIN_EXE=mit-scheme}
+: ${MIT_SCHEME_TOOLCHAIN_EXE=${MIT_SCHEME_EXE=mit-scheme}}
 if test x"${MIT_SCHEME_LIBDIR}" = x; then
     MIT_SCHEME_LIBDIR=`( echo "(display (->namestring" ;\
                         echo "          (system-library-directory-pathname)))" ) \

diff --git a/src/x11/configure.ac b/src/x11/configure.ac
index c39406aff39c0ab7f19cfb073f056ec166e7e9dd..0e03c0c2bfbb1642b0576f51ebcabb00a4201ec5 100644 (file)
--- a/src/x11/configure.ac
+++ b/src/x11/configure.ac
@@ -112,7 +112,7 @@ if test "${no_x}" != yes; then
 fi
 
 MIT_SCHEME_PROJECT=mit-scheme-pucked
-: ${MIT_SCHEME_TOOLCHAIN_EXE=mit-scheme}
+: ${MIT_SCHEME_TOOLCHAIN_EXE=${MIT_SCHEME_EXE=mit-scheme}}
 if test x"${MIT_SCHEME_LIBDIR}" = x; then
     MIT_SCHEME_LIBDIR=`( echo "(display (->namestring" ;\
                         echo "          (system-library-directory-pathname)))" ) \