From f679d8ef048a6b586e03c25475f910325ee49d9f Mon Sep 17 00:00:00 2001 From: Matt Birkholz Date: Wed, 17 May 2017 15:47:01 -0700 Subject: [PATCH] plugins: Use add/remove-plugin procedures. Increment versions. --- src/blowfish/Makefile.am | 35 ++++++++++++++++++++--------------- src/blowfish/configure.ac | 4 +++- src/blowfish/make.scm | 2 +- src/gdbm/Makefile.am | 35 ++++++++++++++++++++--------------- src/gdbm/configure.ac | 4 +++- src/gdbm/make.scm | 2 +- src/mcrypt/Makefile.am | 35 ++++++++++++++++++++--------------- src/mcrypt/configure.ac | 4 +++- src/mcrypt/make.scm | 2 +- src/md5/Makefile.am | 35 ++++++++++++++++++++--------------- src/md5/configure.ac | 4 +++- src/md5/make.scm | 2 +- src/mhash/Makefile.am | 37 +++++++++++++++++++++---------------- src/mhash/configure.ac | 4 +++- src/mhash/make.scm | 2 +- src/x11-screen/Makefile.am | 35 ++++++++++++++++++++--------------- src/x11-screen/configure.ac | 19 +++++++++++-------- src/x11/Makefile.am | 35 ++++++++++++++++++++--------------- src/x11/configure.ac | 19 +++++++++++-------- 19 files changed, 183 insertions(+), 132 deletions(-) diff --git a/src/blowfish/Makefile.am b/src/blowfish/Makefile.am index 8d183be3c..cc67d56f6 100644 --- a/src/blowfish/Makefile.am +++ b/src/blowfish/Makefile.am @@ -28,6 +28,7 @@ EXTRA_DIST = autogen.sh MIT_SCHEME_EXE = @MIT_SCHEME_EXE@ scmlibdir = @MIT_SCHEME_LIBDIR@ scmlib_subdir = $(scmlibdir)blowfish +scmdocdir = $(datarootdir)/doc/@MIT_SCHEME_PROJECT@ scmlib_LTLIBRARIES = blowfish-shim.la scmlib_DATA = blowfish-types.bin blowfish-const.bin @@ -41,13 +42,7 @@ scmlib_sub_DATA = $(sources) $(binaries) scmlib_sub_DATA += make.scm @MIT_SCHEME_PKD@ #info_TEXINFOS = mit-scheme-blowfish.texi -AM_MAKEINFOHTMLFLAGS = --no-split - -# Set these to the defaults used by Scheme. -infodir = $(datarootdir)/info -htmldir = $(libdir)/mit-scheme/doc -dvidir = $(libdir)/mit-scheme/doc -pdfdir = $(libdir)/mit-scheme/doc +#AM_MAKEINFOHTMLFLAGS = --no-split AM_CPPFLAGS = -I@MIT_SCHEME_INCLUDEDIR@ AM_CFLAGS = @MIT_CFLAGS@ @@ -100,18 +95,28 @@ EXTRA_DIST += blowfish-check.scm blowfish-check.sh EXTRA_DIST += make.scm optiondb.scm tags-fix.sh install-data-hook: - echo '(update-optiondb "$(DESTDIR)$(scmlibdir)")' \ + ( echo '(add-plugin "blowfish" "@MIT_SCHEME_PROJECT@"'; \ + echo ' ""'; \ + echo ' "$(DESTDIR)$(scmlibdir)"'; \ + echo ' "$(DESTDIR)$(scmdocdir)")' ) \ + | $(MIT_SCHEME_EXE) --batch-mode + +install-html: install-html-am + ( echo '(add-plugin "blowfish" "@MIT_SCHEME_PROJECT@"'; \ + echo ' ""'; \ + echo ' "$(DESTDIR)$(scmlibdir)"'; \ + echo ' "$(DESTDIR)$(scmdocdir)")' ) \ | $(MIT_SCHEME_EXE) --batch-mode -#install-html: install-html-am -# echo '(update-html-index "$(DESTDIR)$(htmldir)/")' \ -# | $(MIT_SCHEME_EXE) --batch-mode +install-info-am: + +uninstall-info-am: uninstall-hook: - echo '(update-optiondb "$(DESTDIR)$(scmlibdir)")' \ + ( echo '(remove-plugin "blowfish" "@MIT_SCHEME_PROJECT@"'; \ + echo ' ""'; \ + echo ' "$(DESTDIR)$(scmlibdir)"'; \ + echo ' "$(DESTDIR)$(scmdocdir)")' ) \ | $(MIT_SCHEME_EXE) --batch-mode [ -d "$(DESTDIR)$(scmlib_subdir)" ] \ && rmdir "$(DESTDIR)$(scmlib_subdir)" -# [ -d "$(DESTDIR)$(htmldir)" ] \ -# && ( echo '(update-html-index "$(DESTDIR)$(htmldir)/")' \ -# | $(MIT_SCHEME_EXE) --batch-mode ) diff --git a/src/blowfish/configure.ac b/src/blowfish/configure.ac index 675e5cbea..e947f1e6e 100644 --- a/src/blowfish/configure.ac +++ b/src/blowfish/configure.ac @@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ([2.69]) AC_INIT([MIT/GNU Scheme blowfish plugin], - [0.1], + [0.2], [bug-mit-scheme@gnu.org], [mit-scheme-blowfish]) AC_CONFIG_SRCDIR([blowfish.pkg]) @@ -122,6 +122,7 @@ if test "${with_openssl}" != no; then fi fi +MIT_SCHEME_PROJECT=mit-scheme : ${MIT_SCHEME_EXE=mit-scheme} MIT_SCHEME_LIBDIR=`( echo "(display (->namestring" ;\ echo " (system-library-directory-pathname)))" ) \ @@ -158,6 +159,7 @@ done MIT_SCHEME_DEPS="${MIT_SCHEME_DEPS} ${MIT_SCHEME_PKD}: stamp-scheme" +AC_SUBST([MIT_SCHEME_PROJECT]) AC_SUBST([MIT_SCHEME_EXE]) AC_SUBST([MIT_CFLAGS]) AC_SUBST([MIT_SCHEME_LIBDIR]) diff --git a/src/blowfish/make.scm b/src/blowfish/make.scm index f47223977..7677b3de4 100644 --- a/src/blowfish/make.scm +++ b/src/blowfish/make.scm @@ -6,4 +6,4 @@ (lambda () (load-package-set "blowfish"))) -(add-subsystem-identification! "Blowfish" '(0 1)) \ No newline at end of file +(add-subsystem-identification! "Blowfish" '(0 2)) \ No newline at end of file diff --git a/src/gdbm/Makefile.am b/src/gdbm/Makefile.am index 05465953d..a8625dd2c 100644 --- a/src/gdbm/Makefile.am +++ b/src/gdbm/Makefile.am @@ -28,6 +28,7 @@ EXTRA_DIST = autogen.sh MIT_SCHEME_EXE = @MIT_SCHEME_EXE@ scmlibdir = @MIT_SCHEME_LIBDIR@ scmlib_subdir = $(scmlibdir)gdbm +scmdocdir = $(datarootdir)/doc/@MIT_SCHEME_PROJECT@ scmlib_LTLIBRARIES = gdbm-shim.la scmlib_DATA = gdbm-types.bin gdbm-const.bin @@ -41,13 +42,7 @@ scmlib_sub_DATA = $(sources) $(binaries) scmlib_sub_DATA += make.scm @MIT_SCHEME_PKD@ #info_TEXINFOS = mit-scheme-gdbm.texi -AM_MAKEINFOHTMLFLAGS = --no-split - -# Set these to the defaults used by Scheme. -infodir = $(datarootdir)/info -htmldir = $(libdir)/mit-scheme/doc -dvidir = $(libdir)/mit-scheme/doc -pdfdir = $(libdir)/mit-scheme/doc +#AM_MAKEINFOHTMLFLAGS = --no-split AM_CPPFLAGS = -I@MIT_SCHEME_INCLUDEDIR@ AM_CFLAGS = @MIT_CFLAGS@ @@ -100,18 +95,28 @@ EXTRA_DIST += gdbm-check.scm gdbm-check.sh EXTRA_DIST += make.scm optiondb.scm tags-fix.sh install-data-hook: - echo '(update-optiondb "$(DESTDIR)$(scmlibdir)")' \ + ( echo '(add-plugin "gdbm" "@MIT_SCHEME_PROJECT@"'; \ + echo ' ""'; \ + echo ' "$(DESTDIR)$(scmlibdir)"'; \ + echo ' "$(DESTDIR)$(scmdocdir)")' ) \ + | $(MIT_SCHEME_EXE) --batch-mode + +install-html: install-html-am + ( echo '(add-plugin "gdbm" "@MIT_SCHEME_PROJECT@"'; \ + echo ' ""'; \ + echo ' "$(DESTDIR)$(scmlibdir)"'; \ + echo ' "$(DESTDIR)$(scmdocdir)")' ) \ | $(MIT_SCHEME_EXE) --batch-mode -#install-html: install-html-am -# echo '(update-html-index "$(DESTDIR)$(htmldir)/")' \ -# | $(MIT_SCHEME_EXE) --batch-mode +install-info-am: + +uninstall-info-am: uninstall-hook: - echo '(update-optiondb "$(DESTDIR)$(scmlibdir)")' \ + ( echo '(remove-plugin "gdbm" "@MIT_SCHEME_PROJECT@"'; \ + echo ' ""'; \ + echo ' "$(DESTDIR)$(scmlibdir)"'; \ + echo ' "$(DESTDIR)$(scmdocdir)")' ) \ | $(MIT_SCHEME_EXE) --batch-mode [ -d "$(DESTDIR)$(scmlib_subdir)" ] \ && rmdir "$(DESTDIR)$(scmlib_subdir)" -# [ -d "$(DESTDIR)$(htmldir)" ] \ -# && ( echo '(update-html-index "$(DESTDIR)$(htmldir)/")' \ -# | $(MIT_SCHEME_EXE) --batch-mode ) diff --git a/src/gdbm/configure.ac b/src/gdbm/configure.ac index 3a9127357..73d0760f3 100644 --- a/src/gdbm/configure.ac +++ b/src/gdbm/configure.ac @@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ([2.69]) AC_INIT([MIT/GNU Scheme gdbm plugin], - [0.1], + [0.2], [bug-mit-scheme@gnu.org], [mit-scheme-gdbm]) AC_CONFIG_SRCDIR([gdbm.pkg]) @@ -77,6 +77,7 @@ AC_CHECK_HEADER([gdbm.h],[],[ LIBS="-lgdbm" +MIT_SCHEME_PROJECT=mit-scheme : ${MIT_SCHEME_EXE=mit-scheme} MIT_SCHEME_LIBDIR=`( echo "(display (->namestring" ;\ echo " (system-library-directory-pathname)))" ) \ @@ -113,6 +114,7 @@ done MIT_SCHEME_DEPS="${MIT_SCHEME_DEPS} ${MIT_SCHEME_PKD}: stamp-scheme" +AC_SUBST([MIT_SCHEME_PROJECT]) AC_SUBST([MIT_CFLAGS]) AC_SUBST([MIT_SCHEME_EXE]) AC_SUBST([MIT_SCHEME_LIBDIR]) diff --git a/src/gdbm/make.scm b/src/gdbm/make.scm index 797efbb58..75f71ebbf 100644 --- a/src/gdbm/make.scm +++ b/src/gdbm/make.scm @@ -6,4 +6,4 @@ (lambda () (load-package-set "gdbm"))) -(add-subsystem-identification! "GDBM2" '(0 1)) \ No newline at end of file +(add-subsystem-identification! "GDBM2" '(0 2)) \ No newline at end of file diff --git a/src/mcrypt/Makefile.am b/src/mcrypt/Makefile.am index 8b4fa45ab..12998e7b7 100644 --- a/src/mcrypt/Makefile.am +++ b/src/mcrypt/Makefile.am @@ -28,6 +28,7 @@ EXTRA_DIST = autogen.sh MIT_SCHEME_EXE = @MIT_SCHEME_EXE@ scmlibdir = @MIT_SCHEME_LIBDIR@ scmlib_subdir = $(scmlibdir)mcrypt +scmdocdir = $(datarootdir)/doc/@MIT_SCHEME_PROJECT@ scmlib_LTLIBRARIES = mcrypt-shim.la scmlib_DATA = mcrypt-types.bin mcrypt-const.bin @@ -41,13 +42,7 @@ scmlib_sub_DATA = $(sources) $(binaries) scmlib_sub_DATA += make.scm @MIT_SCHEME_PKD@ #info_TEXINFOS = mit-scheme-mcrypt.texi -AM_MAKEINFOHTMLFLAGS = --no-split - -# Set these to the defaults used by Scheme. -infodir = $(datarootdir)/info -htmldir = $(libdir)/mit-scheme/doc -dvidir = $(libdir)/mit-scheme/doc -pdfdir = $(libdir)/mit-scheme/doc +#AM_MAKEINFOHTMLFLAGS = --no-split AM_CPPFLAGS = -I@MIT_SCHEME_INCLUDEDIR@ AM_CFLAGS = @MIT_CFLAGS@ @@ -100,18 +95,28 @@ EXTRA_DIST += mcrypt-check.scm mcrypt-check.sh EXTRA_DIST += make.scm optiondb.scm tags-fix.sh install-data-hook: - echo '(update-optiondb "$(DESTDIR)$(scmlibdir)")' \ + ( echo '(add-plugin "mcrypt" "@MIT_SCHEME_PROJECT@"'; \ + echo ' ""'; \ + echo ' "$(DESTDIR)$(scmlibdir)"'; \ + echo ' "$(DESTDIR)$(scmdocdir)")' ) \ + | $(MIT_SCHEME_EXE) --batch-mode + +install-html: install-html-am + ( echo '(add-plugin "mcrypt" "@MIT_SCHEME_PROJECT@"'; \ + echo ' ""'; \ + echo ' "$(DESTDIR)$(scmlibdir)"'; \ + echo ' "$(DESTDIR)$(scmdocdir)")' ) \ | $(MIT_SCHEME_EXE) --batch-mode -#install-html: install-html-am -# echo '(update-html-index "$(DESTDIR)$(htmldir)/")' \ -# | $(MIT_SCHEME_EXE) --batch-mode +install-info-am: + +uninstall-info-am: uninstall-hook: - echo '(update-optiondb "$(DESTDIR)$(scmlibdir)")' \ + ( echo '(remove-plugin "mcrypt" "@MIT_SCHEME_PROJECT@"'; \ + echo ' ""'; \ + echo ' "$(DESTDIR)$(scmlibdir)"'; \ + echo ' "$(DESTDIR)$(scmdocdir)")' ) \ | $(MIT_SCHEME_EXE) --batch-mode [ -d "$(DESTDIR)$(scmlib_subdir)" ] \ && rmdir "$(DESTDIR)$(scmlib_subdir)" -# [ -d "$(DESTDIR)$(htmldir)" ] \ -# && ( echo '(update-html-index "$(DESTDIR)$(htmldir)/")' \ -# | $(MIT_SCHEME_EXE) --batch-mode ) diff --git a/src/mcrypt/configure.ac b/src/mcrypt/configure.ac index 214ee70b1..c2f1e97cf 100644 --- a/src/mcrypt/configure.ac +++ b/src/mcrypt/configure.ac @@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ([2.69]) AC_INIT([MIT/GNU Scheme mcrypt plugin], - [0.1], + [0.2], [bug-mit-scheme@gnu.org], [mit-scheme-mcrypt]) AC_CONFIG_SRCDIR([mcrypt.pkg]) @@ -107,6 +107,7 @@ MCRYPT_LIBS=`libmcrypt-config --libs` CFLAGS="${MCRYPT_CFLAGS} ${CFLAGS}" LIBS="${LIBS} ${MCRYPT_LIBS}" +MIT_SCHEME_PROJECT=mit-scheme : ${MIT_SCHEME_EXE=mit-scheme} MIT_SCHEME_LIBDIR=`( echo "(display (->namestring" ;\ echo " (system-library-directory-pathname)))" ) \ @@ -143,6 +144,7 @@ done MIT_SCHEME_DEPS="${MIT_SCHEME_DEPS} ${MIT_SCHEME_PKD}: stamp-scheme" +AC_SUBST([MIT_SCHEME_PROJECT]) AC_SUBST([MIT_CFLAGS]) AC_SUBST([MIT_SCHEME_EXE]) AC_SUBST([MIT_SCHEME_LIBDIR]) diff --git a/src/mcrypt/make.scm b/src/mcrypt/make.scm index 3769afb04..61e1c8ad7 100644 --- a/src/mcrypt/make.scm +++ b/src/mcrypt/make.scm @@ -6,4 +6,4 @@ (lambda () (load-package-set "mcrypt"))) -(add-subsystem-identification! "mcrypt" '(0 1)) \ No newline at end of file +(add-subsystem-identification! "mcrypt" '(0 2)) \ No newline at end of file diff --git a/src/md5/Makefile.am b/src/md5/Makefile.am index 508b55ea3..ac14a3aac 100644 --- a/src/md5/Makefile.am +++ b/src/md5/Makefile.am @@ -28,6 +28,7 @@ EXTRA_DIST = autogen.sh MIT_SCHEME_EXE = @MIT_SCHEME_EXE@ scmlibdir = @MIT_SCHEME_LIBDIR@ scmlib_subdir = $(scmlibdir)md5 +scmdocdir = $(datarootdir)/doc/@MIT_SCHEME_PROJECT@ scmlib_LTLIBRARIES = md5-shim.la scmlib_DATA = md5-types.bin md5-const.bin @@ -41,13 +42,7 @@ scmlib_sub_DATA = $(sources) $(binaries) scmlib_sub_DATA += make.scm @MIT_SCHEME_PKD@ #info_TEXINFOS = mit-scheme-md5.texi -AM_MAKEINFOHTMLFLAGS = --no-split - -# Set these to the defaults used by Scheme. -infodir = $(datarootdir)/info -htmldir = $(libdir)/mit-scheme/doc -dvidir = $(libdir)/mit-scheme/doc -pdfdir = $(libdir)/mit-scheme/doc +#AM_MAKEINFOHTMLFLAGS = --no-split AM_CPPFLAGS = -I@MIT_SCHEME_INCLUDEDIR@ AM_CFLAGS = @MIT_CFLAGS@ @@ -100,18 +95,28 @@ EXTRA_DIST += md5-check.scm md5-check.sh EXTRA_DIST += make.scm optiondb.scm tags-fix.sh install-data-hook: - echo '(update-optiondb "$(DESTDIR)$(scmlibdir)")' \ + ( echo '(add-plugin "md5" "@MIT_SCHEME_PROJECT@"'; \ + echo ' ""'; \ + echo ' "$(DESTDIR)$(scmlibdir)"'; \ + echo ' "$(DESTDIR)$(scmdocdir)")' ) \ + | $(MIT_SCHEME_EXE) --batch-mode + +install-html: install-html-am + ( echo '(add-plugin "md5" "@MIT_SCHEME_PROJECT@"'; \ + echo ' ""'; \ + echo ' "$(DESTDIR)$(scmlibdir)"'; \ + echo ' "$(DESTDIR)$(scmdocdir)")' ) \ | $(MIT_SCHEME_EXE) --batch-mode -#install-html: install-html-am -# echo '(update-html-index "$(DESTDIR)$(htmldir)/")' \ -# | $(MIT_SCHEME_EXE) --batch-mode +install-info-am: + +uninstall-info-am: uninstall-hook: - echo '(update-optiondb "$(DESTDIR)$(scmlibdir)")' \ + ( echo '(remove-plugin "md5" "@MIT_SCHEME_PROJECT@"'; \ + echo ' ""'; \ + echo ' "$(DESTDIR)$(scmlibdir)"'; \ + echo ' "$(DESTDIR)$(scmdocdir)")' ) \ | $(MIT_SCHEME_EXE) --batch-mode [ -d "$(DESTDIR)$(scmlib_subdir)" ] \ && rmdir "$(DESTDIR)$(scmlib_subdir)" -# [ -d "$(DESTDIR)$(htmldir)" ] \ -# && ( echo '(update-html-index "$(DESTDIR)$(htmldir)/")' \ -# | $(MIT_SCHEME_EXE) --batch-mode ) diff --git a/src/md5/configure.ac b/src/md5/configure.ac index 396421751..29c3f6071 100644 --- a/src/md5/configure.ac +++ b/src/md5/configure.ac @@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ([2.69]) AC_INIT([MIT/GNU Scheme md5 plugin], - [0.1], + [0.2], [bug-mit-scheme@gnu.org], [mit-scheme-md5]) AC_CONFIG_SRCDIR([md5.pkg]) @@ -122,6 +122,7 @@ if test "${with_openssl}" != no; then fi fi +MIT_SCHEME_PROJECT=mit-scheme : ${MIT_SCHEME_EXE=mit-scheme} MIT_SCHEME_LIBDIR=`( echo "(display (->namestring" ;\ echo " (system-library-directory-pathname)))" ) \ @@ -158,6 +159,7 @@ done MIT_SCHEME_DEPS="${MIT_SCHEME_DEPS} ${MIT_SCHEME_PKD}: stamp-scheme" +AC_SUBST([MIT_SCHEME_PROJECT]) AC_SUBST([MIT_CFLAGS]) AC_SUBST([MIT_SCHEME_EXE]) AC_SUBST([MIT_SCHEME_LIBDIR]) diff --git a/src/md5/make.scm b/src/md5/make.scm index b84c650c3..24aa88808 100644 --- a/src/md5/make.scm +++ b/src/md5/make.scm @@ -6,4 +6,4 @@ (lambda () (load-package-set "md5"))) -(add-subsystem-identification! "MD5" '(0 1)) \ No newline at end of file +(add-subsystem-identification! "MD5" '(0 2)) \ No newline at end of file diff --git a/src/mhash/Makefile.am b/src/mhash/Makefile.am index 002864882..fc33e21d4 100644 --- a/src/mhash/Makefile.am +++ b/src/mhash/Makefile.am @@ -28,6 +28,7 @@ EXTRA_DIST = autogen.sh MIT_SCHEME_EXE = @MIT_SCHEME_EXE@ scmlibdir = @MIT_SCHEME_LIBDIR@ scmlib_subdir = $(scmlibdir)mhash +scmdocdir = $(datarootdir)/doc/@MIT_SCHEME_PROJECT@ scmlib_LTLIBRARIES = mhash-shim.la scmlib_DATA = mhash-types.bin mhash-const.bin @@ -41,13 +42,7 @@ scmlib_sub_DATA = $(sources) $(binaries) scmlib_sub_DATA += make.scm @MIT_SCHEME_PKD@ #info_TEXINFOS = mit-scheme-mhash.texi -AM_MAKEINFOHTMLFLAGS = --no-split - -# Set these to the defaults used by Scheme. -infodir = $(datarootdir)/info -htmldir = $(libdir)/mit-scheme/doc -dvidir = $(libdir)/mit-scheme/doc -pdfdir = $(libdir)/mit-scheme/doc +#AM_MAKEINFOHTMLFLAGS = --no-split AM_CPPFLAGS = -I@MIT_SCHEME_INCLUDEDIR@ AM_CFLAGS = @MIT_CFLAGS@ @@ -97,21 +92,31 @@ TAGS_DEPENDENCIES = $(all_sources) $(cdecls) EXTRA_DIST += $(all_sources) $(cdecls) compile.scm mhash.pkg EXTRA_DIST += mhash-check.scm mhash-check.sh -EXTRA_DIST += make.scm optiondb.scm tags-fix.sh +EXTRA_DIST += make.scm optiondb.scm tags-fix.sh debian install-data-hook: - echo '(update-optiondb "$(DESTDIR)$(scmlibdir)")' \ + ( echo '(add-plugin "mhash" "@MIT_SCHEME_PROJECT@"'; \ + echo ' ""'; \ + echo ' "$(DESTDIR)$(scmlibdir)"'; \ + echo ' "$(DESTDIR)$(scmdocdir)")' ) \ + | $(MIT_SCHEME_EXE) --batch-mode + +install-html: install-html-am + ( echo '(add-plugin "mhash" "@MIT_SCHEME_PROJECT@"'; \ + echo ' ""'; \ + echo ' "$(DESTDIR)$(scmlibdir)"'; \ + echo ' "$(DESTDIR)$(scmdocdir)")' ) \ | $(MIT_SCHEME_EXE) --batch-mode -#install-html: install-html-am -# echo '(update-html-index "$(DESTDIR)$(htmldir)/")' \ -# | $(MIT_SCHEME_EXE) --batch-mode +install-info-am: + +uninstall-info-am: uninstall-hook: - echo '(update-optiondb "$(DESTDIR)$(scmlibdir)")' \ + ( echo '(remove-plugin "mhash" "@MIT_SCHEME_PROJECT@"'; \ + echo ' ""'; \ + echo ' "$(DESTDIR)$(scmlibdir)"'; \ + echo ' "$(DESTDIR)$(scmdocdir)")' ) \ | $(MIT_SCHEME_EXE) --batch-mode [ -d "$(DESTDIR)$(scmlib_subdir)" ] \ && rmdir "$(DESTDIR)$(scmlib_subdir)" -# [ -d "$(DESTDIR)$(htmldir)" ] \ -# && ( echo '(update-html-index "$(DESTDIR)$(htmldir)/")' \ -# | $(MIT_SCHEME_EXE) --batch-mode ) diff --git a/src/mhash/configure.ac b/src/mhash/configure.ac index 13f803971..9f43b53ae 100644 --- a/src/mhash/configure.ac +++ b/src/mhash/configure.ac @@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ([2.69]) AC_INIT([MIT/GNU Scheme mhash plugin], - [0.1], + [0.2], [bug-mit-scheme@gnu.org], [mit-scheme-mhash]) AC_CONFIG_SRCDIR([mhash.pkg]) @@ -104,6 +104,7 @@ AC_CHECK_HEADER([mhash.h],[],[ LIBS="-lmhash" +MIT_SCHEME_PROJECT=mit-scheme : ${MIT_SCHEME_EXE=mit-scheme} MIT_SCHEME_LIBDIR=`( echo "(display (->namestring" ;\ echo " (system-library-directory-pathname)))" ) \ @@ -140,6 +141,7 @@ done MIT_SCHEME_DEPS="${MIT_SCHEME_DEPS} ${MIT_SCHEME_PKD}: stamp-scheme" +AC_SUBST([MIT_SCHEME_PROJECT]) AC_SUBST([MIT_CFLAGS]) AC_SUBST([MIT_SCHEME_EXE]) AC_SUBST([MIT_SCHEME_LIBDIR]) diff --git a/src/mhash/make.scm b/src/mhash/make.scm index 9f2d5000f..e0ab4b163 100644 --- a/src/mhash/make.scm +++ b/src/mhash/make.scm @@ -6,4 +6,4 @@ (lambda () (load-package-set "mhash"))) -(add-subsystem-identification! "mhash" '(0 1)) \ No newline at end of file +(add-subsystem-identification! "mhash" '(0 2)) \ No newline at end of file diff --git a/src/x11-screen/Makefile.am b/src/x11-screen/Makefile.am index 58e8b403d..18b5f8913 100644 --- a/src/x11-screen/Makefile.am +++ b/src/x11-screen/Makefile.am @@ -27,6 +27,7 @@ EXTRA_DIST = autogen.sh MIT_SCHEME_EXE = @MIT_SCHEME_EXE@ scmlibdir = @MIT_SCHEME_LIBDIR@ scmlib_subdir = $(scmlibdir)x11-screen +scmdocdir = $(datarootdir)/doc/@MIT_SCHEME_PROJECT@ sources = @MIT_SCHEME_SCMs@ @@ -36,13 +37,7 @@ scmlib_sub_DATA = $(sources) $(binaries) scmlib_sub_DATA += make.scm @MIT_SCHEME_PKD@ #info_TEXINFOS = mit-scheme-x11-screen.texi -AM_MAKEINFOHTMLFLAGS = --no-split - -# Set these to the defaults used by Scheme. -infodir = $(datarootdir)/info -htmldir = $(libdir)/mit-scheme/doc -dvidir = $(libdir)/mit-scheme/doc -pdfdir = $(libdir)/mit-scheme/doc +#AM_MAKEINFOHTMLFLAGS = --no-split @MIT_SCHEME_DEPS@ stamp-scheme: $(sources) x11-screen.pkg @@ -63,18 +58,28 @@ EXTRA_DIST += x11-screen-check.sh x11-screen-test.scm EXTRA_DIST += make.scm optiondb.scm install-data-hook: - echo '(update-optiondb "$(DESTDIR)$(scmlibdir)")' \ + ( echo '(add-plugin "x11-screen" "@MIT_SCHEME_PROJECT@"'; \ + echo ' ""'; \ + echo ' "$(DESTDIR)$(scmlibdir)"'; \ + echo ' "$(DESTDIR)$(scmdocdir)")' ) \ + | $(MIT_SCHEME_EXE) --batch-mode + +install-html: install-html-am + ( echo '(add-plugin "x11-screen" "@MIT_SCHEME_PROJECT@"'; \ + echo ' ""'; \ + echo ' "$(DESTDIR)$(scmlibdir)"'; \ + echo ' "$(DESTDIR)$(scmdocdir)")' ) \ | $(MIT_SCHEME_EXE) --batch-mode -#install-html: install-html-am -# echo '(update-html-index "$(DESTDIR)$(htmldir)/")' \ -# | $(MIT_SCHEME_EXE) --batch-mode +install-info-am: + +uninstall-info-am: uninstall-hook: - echo '(update-optiondb "$(DESTDIR)$(scmlibdir)")' \ + ( echo '(remove-plugin "x11-screen" "@MIT_SCHEME_PROJECT@"'; \ + echo ' ""'; \ + echo ' "$(DESTDIR)$(scmlibdir)"'; \ + echo ' "$(DESTDIR)$(scmdocdir)")' ) \ | $(MIT_SCHEME_EXE) --batch-mode [ -d "$(DESTDIR)$(scmlib_subdir)" ] \ && rmdir "$(DESTDIR)$(scmlib_subdir)" -# [ -d "$(DESTDIR)$(htmldir)" ] \ -# && ( echo '(update-html-index "$(DESTDIR)$(htmldir)/")' \ -# | $(MIT_SCHEME_EXE) --batch-mode ) diff --git a/src/x11-screen/configure.ac b/src/x11-screen/configure.ac index e272e29fc..ab85defbb 100644 --- a/src/x11-screen/configure.ac +++ b/src/x11-screen/configure.ac @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT([MIT/GNU Scheme Edwin X11 Screen], +AC_INIT([MIT/GNU Scheme Edwin X11 Screen plugin], [0.1], [bug-mit-scheme@gnu.org], [mit-scheme-x11-screen]) @@ -14,25 +14,27 @@ AC_COPYRIGHT( This file is part of an X11-screen plugin for MIT/GNU Scheme. -This plugin is free software; you can redistribute it and/or modify it -under the terms of the GNU General Public License as published by the -Free Software Foundation; either version 2 of the License, or (at your -option) any later version. +MIT/GNU Scheme is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or (at +your option) any later version. -This plugin is distributed in the hope that it will be useful, but +MIT/GNU Scheme is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with this plugin; if not, write to the Free Software Foundation, -Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. +along with MIT/GNU Scheme; if not, write to the Free Software +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, +USA. ]) AM_INIT_AUTOMAKE AC_PROG_INSTALL +MIT_SCHEME_PROJECT=mit-scheme : ${MIT_SCHEME_EXE=mit-scheme} MIT_SCHEME_LIBDIR=`( echo "(display (->namestring" ;\ echo " (system-library-directory-pathname)))" ) \ @@ -64,6 +66,7 @@ done MIT_SCHEME_DEPS="${MIT_SCHEME_DEPS} ${MIT_SCHEME_PKD}: stamp-scheme" +AC_SUBST([MIT_SCHEME_PROJECT]) AC_SUBST([MIT_SCHEME_EXE]) AC_SUBST([MIT_SCHEME_LIBDIR]) AC_SUBST([MIT_SCHEME_INCLUDEDIR]) diff --git a/src/x11/Makefile.am b/src/x11/Makefile.am index fc593bd76..12e793b11 100644 --- a/src/x11/Makefile.am +++ b/src/x11/Makefile.am @@ -28,6 +28,7 @@ EXTRA_DIST = autogen.sh MIT_SCHEME_EXE = @MIT_SCHEME_EXE@ scmlibdir = @MIT_SCHEME_LIBDIR@ scmlib_subdir = $(scmlibdir)x11 +scmdocdir = $(datarootdir)/doc/@MIT_SCHEME_PROJECT@ scmlib_LTLIBRARIES = x11-shim.la scmlib_DATA = x11-types.bin x11-const.bin @@ -41,13 +42,7 @@ scmlib_sub_DATA = $(sources) $(binaries) scmlib_sub_DATA += make.scm @MIT_SCHEME_PKD@ #info_TEXINFOS = mit-scheme-x11.texi -AM_MAKEINFOHTMLFLAGS = --no-split - -# Set these to the defaults used by Scheme. -infodir = $(datarootdir)/info -htmldir = $(libdir)/mit-scheme/doc -dvidir = $(libdir)/mit-scheme/doc -pdfdir = $(libdir)/mit-scheme/doc +#AM_MAKEINFOHTMLFLAGS = --no-split AM_CPPFLAGS = -I@MIT_SCHEME_INCLUDEDIR@ AM_CFLAGS = @MIT_CFLAGS@ @@ -100,18 +95,28 @@ EXTRA_DIST += x11-check.sh x11-test.scm EXTRA_DIST += make.scm optiondb.scm tags-fix.sh install-data-hook: - echo '(update-optiondb "$(DESTDIR)$(scmlibdir)")' \ + ( echo '(add-plugin "x11" "@MIT_SCHEME_PROJECT@"'; \ + echo ' ""'; \ + echo ' "$(DESTDIR)$(scmlibdir)"'; \ + echo ' "$(DESTDIR)$(scmdocdir)")' ) \ + | $(MIT_SCHEME_EXE) --batch-mode + +install-html: install-html-am + ( echo '(add-plugin "x11" "@MIT_SCHEME_PROJECT@"'; \ + echo ' ""'; \ + echo ' "$(DESTDIR)$(scmlibdir)"'; \ + echo ' "$(DESTDIR)$(scmdocdir)")' ) \ | $(MIT_SCHEME_EXE) --batch-mode -#install-html: install-html-am -# echo '(update-html-index "$(DESTDIR)$(htmldir)/")' \ -# | $(MIT_SCHEME_EXE) --batch-mode +install-info-am: + +uninstall-info-am: uninstall-hook: - echo '(update-optiondb "$(DESTDIR)$(scmlibdir)")' \ + ( echo '(remove-plugin "x11" "@MIT_SCHEME_PROJECT@"'; \ + echo ' ""'; \ + echo ' "$(DESTDIR)$(scmlibdir)"'; \ + echo ' "$(DESTDIR)$(scmdocdir)")' ) \ | $(MIT_SCHEME_EXE) --batch-mode [ -d "$(DESTDIR)$(scmlib_subdir)" ] \ && rmdir "$(DESTDIR)$(scmlib_subdir)" -# [ -d "$(DESTDIR)$(htmldir)" ] \ -# && ( echo '(update-html-index "$(DESTDIR)$(htmldir)/")' \ -# | $(MIT_SCHEME_EXE) --batch-mode ) diff --git a/src/x11/configure.ac b/src/x11/configure.ac index 8915c60af..a6cbdfd09 100644 --- a/src/x11/configure.ac +++ b/src/x11/configure.ac @@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ([2.69]) AC_INIT([MIT/GNU Scheme x11 plugin], - [0.1], + [0.2], [bug-mit-scheme@gnu.org], [mit-scheme-x11]) AC_CONFIG_SRCDIR([x11.pkg]) @@ -16,19 +16,20 @@ AC_COPYRIGHT( This file is part of an x11 plugin for MIT/GNU Scheme. -This plugin is free software; you can redistribute it and/or modify it -under the terms of the GNU General Public License as published by the -Free Software Foundation; either version 2 of the License, or (at your -option) any later version. +MIT/GNU Scheme is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or (at +your option) any later version. -This plugin is distributed in the hope that it will be useful, but +MIT/GNU Scheme is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with this plugin; if not, write to the Free Software Foundation, -Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. +along with MIT/GNU Scheme; if not, write to the Free Software +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, +USA. ]) AM_INIT_AUTOMAKE @@ -77,6 +78,7 @@ if ! pkg-config --exists x11 2>/dev/null; then AC_MSG_ERROR([X11 not found.]) fi +MIT_SCHEME_PROJECT=mit-scheme : ${MIT_SCHEME_EXE=mit-scheme} MIT_SCHEME_LIBDIR=`( echo "(display (->namestring" ;\ echo " (system-library-directory-pathname)))" ) \ @@ -114,6 +116,7 @@ MIT_SCHEME_DEPS="${MIT_SCHEME_DEPS} ${MIT_SCHEME_PKD}: stamp-scheme" AC_SUBST([MIT_CFLAGS]) +AC_SUBST([MIT_SCHEME_PROJECT]) AC_SUBST([MIT_SCHEME_EXE]) AC_SUBST([MIT_SCHEME_LIBDIR]) AC_SUBST([MIT_SCHEME_INCLUDEDIR]) -- 2.25.1