From 0eb1e899579d36213ee0502c31a77a560ad2f85d Mon Sep 17 00:00:00 2001
From: Matt Birkholz <matt@birkholz.chandler.az.us>
Date: Mon, 18 May 2009 10:25:57 -0700
Subject: [PATCH] Cleaned up for release.

* .gitignore, doc/.gitignore, src/.gitignore:

These versions are perhaps too narrow.  They are just sufficient for a
i386-linux build.

* doc/user-manual/user.texinfo:

Quieted a bogus texinfo warning with whitespace.

* src/microcode/Tags.sh:

`make tags' in src/ (the src/Tags.sh script) expects a Tags.sh in all
SUBDIR.

* src/microcode/configure.ac:

Avoid duplicate prbfish and prmd5 in MODULE_BASES, to quiet a make
warning.  I do not see why this is happening, but it is happening in
master as well.
---
 .gitignore                   | 14 +++++-----
 doc/.gitignore               | 27 +++++++++++++++++++
 doc/user-manual/user.texinfo |  2 +-
 src/.gitignore               | 52 ++++++++++++++++++++++++++++++++++++
 src/microcode/Tags.sh        |  8 ++++++
 src/microcode/configure.ac   |  7 ++++-
 6 files changed, 102 insertions(+), 8 deletions(-)
 create mode 100644 doc/.gitignore
 create mode 100644 src/.gitignore
 create mode 100755 src/microcode/Tags.sh

diff --git a/.gitignore b/.gitignore
index e0ee77a15..0227a10b6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,8 @@
-C/
-LOG
-html/
-linux/
-macosx/
-.edwin-ffi
+*.orig
+configure
+config.guess
+config.log
+config.status
+config.sub
+autom4te.cache
+Makefile
diff --git a/doc/.gitignore b/doc/.gitignore
new file mode 100644
index 000000000..dc7eb5591
--- /dev/null
+++ b/doc/.gitignore
@@ -0,0 +1,27 @@
+/*/*.log
+/*/*.aux
+/*/*.cp
+/*/*.cps
+/*/*.fn
+/*/*.fns
+/*/*.ky
+/*/*.kys
+/*/*.pg
+/*/*.toc
+/*/*.tp
+/*/*.vr
+/*/*.vrs
+/*/*.nv
+/*/*.nvs
+/*/*.op
+/*/*.ops
+/*/*.info
+/*/*.info-*
+/*/*.ps
+/*/*.pdf
+/make-common
+/ffi/mit-scheme-ffi
+/imail/mit-scheme-imail
+/ref-manual/mit-scheme-ref
+/sos/mit-scheme-sos
+/user-manual/mit-scheme-user
diff --git a/doc/user-manual/user.texinfo b/doc/user-manual/user.texinfo
index 231e60a4f..680f44594 100644
--- a/doc/user-manual/user.texinfo
+++ b/doc/user-manual/user.texinfo
@@ -1910,7 +1910,7 @@ storage available after collection, an exact non-negative integer.
 to system tasks after the need for a garbage collection is detected and
 before the garbage collector is started.  (An example of such a system
 task is changing the run-light to show ``gc'' when scheme is running
-under Emacs.)  @strong{Note well} that you should not specify
+under Emacs.)  @strong{ Note well} that you should not specify
 @var{safety-margin} unless you know what you are doing.  If you specify
 a value that is too small, you can put Scheme in an unusable state.
 @end deffn
diff --git a/src/.gitignore b/src/.gitignore
new file mode 100644
index 000000000..2bf035894
--- /dev/null
+++ b/src/.gitignore
@@ -0,0 +1,52 @@
+*.[oa]
+*.so
+
+*.bin
+*.ext
+*.com
+*.bci
+*.crf
+*.fre
+*.pkd
+
+/*/Clean.sh
+/*/Setup.sh
+/*/Stage.sh
+/*/Tags.sh
+!/microcode/Clean.sh
+!/microcode/Setup.sh
+!/microcode/Tags.sh
+/*/TAGS
+/*/Makefile.in
+/*/.edwin-ffi
+/lib
+/makefiles_created
+
+/compiler/machines/*/compiler.cbf
+/compiler/machines/*/compiler.pkg
+/compiler/machines/*/compiler.sf
+/compiler/compiler.cbf
+/compiler/compiler.pkg
+/compiler/compiler.sf
+/compiler/machine
+/compiler/machines/vax/dinstr?.scm
+
+/edwin/edwin.bld
+
+/microcode/.gdbinit*
+/microcode/Makefile.deps
+/microcode/cmpauxmd.m4
+/microcode/cmpauxmd/i386-nt.asm
+/microcode/cmpauxmd/i386-ntw.asm
+/microcode/cmpintmd-config.h
+/microcode/cmpintmd.c
+/microcode/cmpintmd.h
+/microcode/config.h
+/microcode/config.h.in
+/microcode/findprim
+/microcode/liarc-rules
+/microcode/liarc-vars
+/microcode/makegen-cc
+/microcode/makegen/liarc-base-rules
+/microcode/scheme
+/microcode/usrdef.c
diff --git a/src/microcode/Tags.sh b/src/microcode/Tags.sh
new file mode 100755
index 000000000..1744e2b3e
--- /dev/null
+++ b/src/microcode/Tags.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+#
+# $Id: $
+
+# Utility to make TAGS file for the MIT/GNU Scheme MICROCODE build
+# directory.  The working directory must be the build directory.
+
+make tags
diff --git a/src/microcode/configure.ac b/src/microcode/configure.ac
index f75ad3922..97ff83e09 100644
--- a/src/microcode/configure.ac
+++ b/src/microcode/configure.ac
@@ -706,7 +706,12 @@ if test "${with_openssl}" != no; then
 	    AC_DEFINE([HAVE_LIBCRYPTO], [1],
 		[Define to 1 if you have the `crypto' library (-lcrypto).])
 	    MODULE_LIBS="-lcrypto ${MODULE_LIBS}"
-	    MODULE_BASES="${MODULE_BASES} prbfish prmd5"
+	    if ! expr "X$MODULE_BASES" : ".* prbfish"; then
+		MODULE_BASES="${MODULE_BASES} prbfish"
+	    fi
+	    if ! expr "X$MODULE_BASES" : ".* prmd5"; then
+		MODULE_BASES="${MODULE_BASES} prmd5"
+	    fi
 	    PRBFISH_LIBS="-lcrypto"
 	    PRMD5_LIBS="-lcrypto"
 	    ])
-- 
2.25.1