From a8074fe2035d97f5178c41104dd44c839987c380 Mon Sep 17 00:00:00 2001
From: "Kevin M. Rosenberg" <kevin@rosenberg.net>
Date: Tue, 23 Apr 2002 21:32:25 +0000
Subject: [PATCH] r1794: Debian docbook updates

---
 ChangeLog    |  2 ++
 Makefile     |  4 ++--
 doc/Makefile | 12 ++++++------
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d3e9e09..b8b7f3d 100644
--- 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 763758b..01d6ee9 100644
--- 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 6942bcc..85a9f02 100644
--- 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}
 
-- 
2.34.1