From 16291f3dc068d50c023185cc6faa2abad9e4fab5 Mon Sep 17 00:00:00 2001 From: Matt Birkholz Date: Mon, 26 Nov 2018 10:53:19 -0700 Subject: [PATCH] plugins: Use MIT_SCHEME_EXE for "toolchain". Fix Makefile merges. --- src/blowfish/Makefile.am | 6 +++++- src/blowfish/configure.ac | 5 +---- src/edwin/configure.ac | 2 +- src/gdbm/Makefile.am | 8 +++++--- src/gdbm/configure.ac | 5 +---- src/imail/Makefile.am | 4 ++++ src/imail/configure.ac | 5 +---- src/mcrypt/configure.ac | 2 +- src/pgsql/configure.ac | 2 +- src/x11-screen/configure.ac | 2 +- src/x11/configure.ac | 2 +- 11 files changed, 22 insertions(+), 21 deletions(-) diff --git a/src/blowfish/Makefile.am b/src/blowfish/Makefile.am index 13d769954..f168b3143 100644 --- 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 b497f3541..21553d7aa 100644 --- 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 29482bfb3..188556290 100644 --- 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 b0ab3bf76..2ac5c2c30 100644 --- 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 cd7fd419b..d8c673dae 100644 --- 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 6d8d58efa..119731082 100644 --- 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 78d26a9cb..c3fa84426 100644 --- 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 1ad680680..46b4c896e 100644 --- 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 d34eccad8..be2e7059b 100644 --- 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 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 b213fbfc2..90bad0dac 100644 --- 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 c39406aff..0e03c0c2b 100644 --- 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)))" ) \ -- 2.25.1