r9990: 10 Sep 2004 Kevin Rosenberg <kevin@rosenberg.net>

        * doc/Makefile, doc/catalog-darwin.xml: Apply
        patch from Cyrus Harmon for building docs on Mac OS X

diff --git a/ChangeLog b/ChangeLog
index 0a6cbcdfc89dcaf773080513db6b28b1d0311e13..207df0943a7f4ac06b4a134a2b0106d54e6608af 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+10 Sep 2004 Kevin Rosenberg <kevin@rosenberg.net>
+       * doc/Makefile, doc/catalog-darwin.xml: Apply
+       patch from Cyrus Harmon for building docs on Mac OS X
+       
 09 Sep 2004 Kevin Rosenberg <kevin@rosenberg.net>
        * Version 3.0.4 Release
        * multiple: Remove superfluous quotes in UFFI def-type

diff --git a/doc/Makefile b/doc/Makefile
index 39c411eb6264d55856a1e2e37094f30acac22453..9f9327dfcb27c2660f3531140dd6c4b7ca4b4196 100644 (file)
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -21,11 +21,13 @@ DOCFILE_EXT_DEFAULT:=xml
 
 # Standard docfile processing
 
-DEBIAN=$(shell expr "`cat /etc/issue`" : '.*Debian.*')
-SUSE=$(shell expr "`cat /etc/issue`" : '.*SuSE.*')
-SUSE91=$(shell expr "`cat /etc/issue`" : '.*SuSE Linux 9.1.*')
-REDHAT=$(shell expr "`cat /etc/issue`" : '.*Red Hat.*')
-MANDRAKE=$(shell expr "`cat /etc/issue`" : '.*Mandrake.*')
+DEBIAN=$(shell expr "`cat /etc/issue 2> /dev/null`" : '.*Debian.*')
+SUSE=$(shell expr "`cat /etc/issue 2> /dev/null`" : '.*SuSE.*')
+SUSE91=$(shell expr "`cat /etc/issue 2> /dev/null`" : '.*SuSE Linux 9.1.*')
+REDHAT=$(shell expr "`cat /etc/issue 2> /dev/null`" : '.*Red Hat.*')
+MANDRAKE=$(shell expr "`cat /etc/issue 2> /dev/null`" : '.*Mandrake.*')
+DARWIN=$(shell expr "`uname -a`" : '.*Darwin.*')
+
 
 ifneq (${DEBIAN},0)
 OS:=debian
@@ -41,13 +43,16 @@ else
       else   
         ifneq (${MANDRAKE},0)
           OS=mandrake
+       else   
+          ifneq (${DARWIN},0)
+            OS=darwin
+         endif 
         endif
       endif
     endif
   endif
 endif
 
-
 ifndef DOCFILE_BASE
 DOCFILE_BASE=${DOCFILE_BASE_DEFAULT}
 endif

diff --git a/doc/catalog-darwin.xml b/doc/catalog-darwin.xml
new file mode 100644 (file)
index 0000000..0ed575f
--- /dev/null
+++ b/doc/catalog-darwin.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" ?>
+<!DOCTYPE catalog
+   PUBLIC "-//OASIS/DTD Entity Resolution XML Catalog V1.0//EN"
+   "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">
+
+<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
+
+  <!-- The directory DTD and stylesheet files are installed under -->
+  <group  xml:base="file:///sw/share/xml/" >
+
+    <!-- Resolve DTD URL system ID to local file -->
+    <rewriteSystem
+        systemIdStartString="http://www.oasis-open.org/docbook/xml/4.2/"
+        rewritePrefix="dtd/docbookx/4.2.0/" />
+    <!-- Resolve stylesheet URL to local file -->
+    <rewriteURI
+        uriStartString="http://docbook.sourceforge.net/release/xsl/current/"
+        rewritePrefix="xsl/docbook-xsl/" />
+
+    <!-- Resolve DTD PUBLIC identifiers -->
+    <nextCatalog  catalog="dtd/xml/4.2/catalog.xml" />
+
+    <!-- To resolve simple DTD SYSTEM identifiers. -->
+    <!-- Note: this does not work with Java resolver -->
+    <!--   classes in Saxon or Xalan -->
+    <system
+         systemId="docbook.dtd"
+         uri="dtd/xml/4.2.0/xml/docbookx.dtd" />
+
+    <!-- To resolve short stylesheet references -->
+    <uri
+        name="docbook_html.xsl"
+        uri="xsl/docbook-xsl/xhtml/docbook.xsl" />
+    <uri 
+        name="docbook_chunk.xsl"
+        uri="xsl/docbook-xsl/xhtml/chunk.xsl" />
+    <uri
+        name="docbook_fo.xsl"
+        uri="xsl/docbook-xsl/fo/docbook.xsl" />
+
+  </group>
+
+</catalog>

diff --git a/sql/package.lisp b/sql/package.lisp
index 750ab907694583cacb1b53148cae0e2f7bebc52a..38fcaf7f28f4fca080791918169daefee4378810 100644 (file)
--- a/sql/package.lisp
+++ b/sql/package.lisp
@@ -38,6 +38,7 @@
          #+clsql-sbcl-mop #:sb-mop
          #+clsql-cmucl-mop #:mop
          #+allegro #:mop
+         #+clisp #:clos
          #+lispworks #:clos
          #+scl #:clos
          #+openmcl #:openmcl-mop)
@@ -45,6 +46,9 @@
     #+allegro
     (:shadowing-import-from 
      #:excl)
+    #+clisp
+    (:shadowing-import-from 
+     #:clos)
     #+lispworks
     (:shadowing-import-from 
      #:clos)