r1794: Debian docbook updates

diff --git a/ChangeLog b/ChangeLog
index d3e9e09b29fc877b4899b814769631bae0af298a..b8b7f3d8c94833634ce4dd9794808a7c72611f6c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,8 @@
        Fix loading on Win32
        * test-suite/tester-clsql.cl
        Fix type coercion of double-float
+       * doc/*
+       Added debian docbook catalog, made it the default
        
 19 Apr 2002 Marc Battyani (marc.battyani@fractalconcept.com)
        * interface/postgresql/postgresql-api.cl:

diff --git a/Makefile b/Makefile
index 763758be50de2a717378214618640aaa129266aa..01d6ee9f0a7cac74483d9e11b871e1f8c596cb5e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@
 #  Programer:    Kevin M. Rosenberg
 #  Date Started: Mar 2002
 #
-#  CVS Id:   $Id: Makefile,v 1.13 2002/04/07 09:26:20 kevin Exp $
+#  CVS Id:   $Id: Makefile,v 1.14 2002/04/23 21:32:25 kevin Exp $
 #
 # This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 #
@@ -65,7 +65,7 @@ dist: distclean tagcvs
                -name \*.system -or -name Makefile -or -name ChangeLog -or \
                -name COPYRIGHT -or -name TODO -or -name README -or -name INSTALL \
                -or -name NEWS -or -name \*.sgml -or -name COPYING\* -or -name catalog \
-               | xargs unix2dos -q
+               | xargs unix2dos
        @zip -rq $(DIST_ZIP) $(DISTDIR)
        @rm -r $(DISTDIR)
 

diff --git a/doc/Makefile b/doc/Makefile
index 6942bccaf92338bd8ef2870ed5fd7d61b49ddf61..85a9f0269aae7ddab6af7aafa4ee2e49d233e2ff 100644 (file)
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -5,11 +5,11 @@
 #  Programer:    Kevin M. Rosenberg
 #  Date Started: Mar 2002
 #
-#  CVS Id:   $Id: Makefile,v 1.6 2002/04/23 21:25:51 kevin Exp $
+#  CVS Id:   $Id: Makefile,v 1.7 2002/04/23 21:32:25 kevin Exp $
 #
-# This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg
+# This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 #
-# UFFI users are granted the rights to distribute and use this software
+# CLSQL users are granted the rights to distribute and use this software
 # as governed by the terms of the Lisp Lesser GNU Public License
 # (http://opensource.franz.com/preamble.html), also known as the LLGPL.
 
@@ -52,7 +52,7 @@ all: html pdf ps dvi
 
 dist: html pdf
 
-CHECK=nsgmls -s -C catalog || exit 1
+CHECK=nsgmls -s -C ${CATALOG} || exit 1
 
 check:
        $(CHECK)
@@ -61,13 +61,13 @@ html: html/book1.htm
 
 html/book1.htm: ${DOCFILES} 
        $(CHECK)
-       ( rm -rf html ; mkdir html; cd html ; jade -t sgml -c ../catalog -d ${DSSSL_HTML} ../${DOCFILE}; cd ..)
+       ( rm -rf html ; mkdir html; cd html ; jade -t sgml -c ../${CATALOG} -d ${DSSSL_HTML} ../${DOCFILE}; cd ..)
 
 tex: ${TEXFILE}
 
 ${TEXFILE}: ${DOCFILES}
        $(CHECK)
-       @jade -t tex -c catalog -d ${DSSSL_PRINT} ${DOCFILE}
+       @jade -t tex -c ${CATALOG} -d ${DSSSL_PRINT} ${DOCFILE}
 
 pdf: ${PDFFILE}