plugins: Use add/remove-plugin procedures. Increment versions.

diff --git a/src/blowfish/Makefile.am b/src/blowfish/Makefile.am
index 8d183be3c14ca483cfbb04e9882c3566e6cccffb..cc67d56f681173351fa454956b8154fcbbf13377 100644 (file)
--- 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 675e5cbeaab50ea982dc26fa118ffee9f2903e42..e947f1e6ed0366b26425bd99cdf3bf1da3fa7b67 100644 (file)
--- 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 f472239779fb07e1f47d468c22aacf529c6ec68b..7677b3de4813912cc0ddb042418d544864032578 100644 (file)
--- 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 05465953d286a0ddecd3065163b6924d5942c501..a8625dd2c97fafb9b60df1f72dac5e786239e55e 100644 (file)
--- 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 3a91273577cbc4d90da6e86807db7f078de8cf08..73d0760f3d0c66ab56a1b0034670d0b0a8a5ae7f 100644 (file)
--- 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 797efbb5838f616ad85e088bf9ebaa5d8c2875ab..75f71ebbff929e008df029e2ef4e4f6923b7b13b 100644 (file)
--- 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 8b4fa45ab6f1de58c43f649f4b87181265ed2aee..12998e7b7792694f17271b7e7a89dd8620ad3016 100644 (file)
--- 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 214ee70b15d0ba3971a25597f51b514d9890d894..c2f1e97cf43d9fa6e4e3f2d076b732c4ca50a26f 100644 (file)
--- 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 3769afb047ae00e6a5ab5a422911dddf30f408c0..61e1c8ad7c71c5593f3eaeb483bd4f41bf30afd1 100644 (file)
--- 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 508b55ea3285a2dbc1c55739500baa7891a657ed..ac14a3aacd90e2dd4ebd02626436e0414f3e4c0c 100644 (file)
--- 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 3964217518aa7d81ba04126fb5162384d84a6824..29c3f6071ef953069b390545eba0095fda3b504c 100644 (file)
--- 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 b84c650c36fde9562a1106787b0869470d7a43d3..24aa88808ca9f05e4f514870729d2195ceff53ec 100644 (file)
--- 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 0028648829dd79dabf22b81ae1b23e729472752b..fc33e21d4c878a64ee65449c95c3cddb7b0da902 100644 (file)
--- 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 13f803971bbc03901eb40104662ad6adf662587a..9f43b53aeeb614c0a1dcd54a817885d03f4d7b88 100644 (file)
--- 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 9f2d5000f9bb88f10dd45fa09f1fd37fab7b84af..e0ab4b16302dc8a46e6278e42ea76a70421d021a 100644 (file)
--- 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 58e8b403d1004c397908c246e689e031a4535f9c..18b5f891343d273a292734b192baeff6fe16a874 100644 (file)
--- 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 e272e29fcd9591d033b93b7cc9da069a22f11ebf..ab85defbbacaca6ab36d8a5ae2f6e650cc531be9 100644 (file)
--- 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 fc593bd76b2dfc949b0780cfcbcc81a0324955da..12e793b114a0680c484f88c1b0063d6bd4ab6149 100644 (file)
--- 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 8915c60af5d7a57f6b1d53ed0e63271e6199ebd8..a6cbdfd091857310000e65c6e1850bd32f960b63 100644 (file)
--- 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])