r2193: *** empty log message ***

diff --git a/cvsbp-prepare.sh b/cvsbp-prepare.sh
index abe49b6b8d27f085beef1fe61a0cc4d5fb8760a4..0fb44970dd64fff94dab60e89c34a112e9c90bb2 100755 (executable)
--- a/cvsbp-prepare.sh
+++ b/cvsbp-prepare.sh
@@ -2,19 +2,6 @@
 
 set -e  # abort on error
 
-# Make documentation to put in debian package 
-# This must match prebuilt upstream documentation
-
-if [ -f doc/Makefile ]; then
-  echo "Making upstream documentation for CVS checked-out package"
-  cd doc
-  make all
-  cd ..
-else
-  echo "Unable to build documentation for CVS checked out package"
-  exit 1
-fi
-
 echo "Cleaning checkout CVS directory"
 rm -f upload.sh make-upstream.sh make-debian.sh
 rm -f `find . -type f -name .cvsignore`

diff --git a/debian/changelog b/debian/changelog
index 7a7a54c0f1a8316bed98d31bcc2055198070d43d..93be34c9961218d1a3c94b4bfc83b76afa68068f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+cl-sql (0.7.3-2) unstable; urgency=low
+
+  * Move .so files into /usr/lib/cl-sql directory
+  
+  * Move documentation into the clsql-base package
+
+ -- Kevin M. Rosenberg <kevin@rosenberg.net>  Mon,  8 Jul 2002 11:10:11 -0600
+
 cl-sql (0.7.3-1) unstable; urgency=low
 
   * Added missing documentation to upstream package.

diff --git a/debian/rules b/debian/rules
index cd4bc4d49c37cfabb188bb0d2f22e7cbbeef7443..f6cdeef8e8d8b03ff87c9457a84d54770036c2e1 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -46,7 +46,7 @@ INSTALLDIRFLAGS       := -d -g root -o root -m 0755
 clc-base       := usr/share/common-lisp
 clc-source     := $(clc-base)/source
 clc-systems    := $(clc-base)/systems
-doc-dir                := $(prefix)/usr/share/doc/cl-sql
+doc-dir                := $(prefix-base)/usr/share/doc/cl-sql
 
 clc-clsql      := $(clc-source)/$(plain-pkg)-$(UPSTREAM_VER)
 
@@ -54,7 +54,9 @@ lispdir               := $(prefix)/$(clc-clsql)
 lispdir-sql    := $(prefix)/$(clc-clsql)/sql
 lispdir-base   := $(prefix-base)/$(clc-clsql)/base
 lispdir-base-uffi := $(prefix-base)/$(clc-clsql)/interfaces/clsql-uffi
+sodir-base-uffi := $(prefix-base)/usr/lib/cl-sql
 lispdir-mysql  := $(prefix-mysql)/$(clc-clsql)/interfaces/mysql
+sodir-mysql    := $(prefix-mysql)/usr/lib/cl-sql
 lispdir-pg     := $(prefix-pg)/$(clc-clsql)/interfaces/postgresql
 lispdir-pg-socket := $(prefix-pg-socket)/$(clc-clsql)/interfaces/postgresql-socket
 lispdir-aodbc  := $(prefix-aodbc)/$(clc-clsql)/interfaces/aodbc
@@ -91,7 +93,8 @@ install: build
 
        $(INSTALL) $(INSTALLDIRFLAGS) $(lispdir) $(lispdir-base) \
                $(lispdir-base-uffi) $(lispdir-pg) $(lispdir-pg-socket) \
-               $(lispdir-mysql) $(lispdir-sql) $(lispdir-aodbc)
+               $(lispdir-mysql) $(lispdir-sql) $(lispdir-aodbc) \
+               $(sodir-base-uffi) $(sodir-mysql)
 
        # Main package
        $(INSTALL) $(INSTALLDIRFLAGS) $(lispdir) $(lispdir-int)
@@ -100,10 +103,10 @@ install: build
        # Base
        $(INSTALL) $(INSTALLFLAGS) $(srcs-base) $(lispdir-base)
        $(INSTALL) $(INSTALLFLAGS) $(srcs-base-uffi) $(lispdir-base-uffi)
-       $(INSTALL) $(INSTALLEXECFLAGS) $(srcs-base-uffi-so) $(lispdir-base-uffi)
+       $(INSTALL) $(INSTALLEXECFLAGS) $(srcs-base-uffi-so) $(sodir-base-uffi)
 
        $(INSTALL) $(INSTALLFLAGS) $(srcs-mysql) $(lispdir-mysql)
-       $(INSTALL) $(INSTALLEXECFLAGS) $(srcs-mysql-so) $(lispdir-mysql)
+       $(INSTALL) $(INSTALLEXECFLAGS) $(srcs-mysql-so) $(sodir-mysql)
        $(INSTALL) $(INSTALLFLAGS) $(srcs-pg) $(lispdir-pg)
        $(INSTALL) $(INSTALLFLAGS) $(srcs-pg-socket) $(lispdir-pg-socket)
        $(INSTALL) $(INSTALLFLAGS) $(srcs-aodbc) $(lispdir-aodbc)

diff --git a/doc/Makefile b/doc/Makefile
index 8a1d07d6a726f76a655bfdba7a2cf67e6a3b1c80..32a549bdd65fc28cd7123693e3c094e6a2e048c9 100644 (file)
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -5,7 +5,7 @@
 #  Programer:    Kevin M. Rosenberg
 #  Date Started: Mar 2002
 #
-#  CVS Id:   $Id: Makefile,v 1.13 2002/06/20 14:58:21 kevin Exp $
+#  CVS Id:   $Id: Makefile,v 1.14 2002/07/08 17:18:53 kevin Exp $
 #
 # This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 #
@@ -61,9 +61,12 @@ CHECK=nsgmls -s -C ${CATALOG} || exit 1
 check:
        @$(CHECK)
 
-html: $(DOCFILES)
+.PHONY: html
+html: html.tar.gz
+
+html.tar.gz: $(DOCFILES)
        @$(CHECK)
-       @( rm -rf html ; mkdir html; cd html ; jade -t sgml -c ../${CATALOG} -d ${DSSSL_HTML} ../${DOCFILE} > /dev/null; cp book1.html index.html; cd ..)
+       @( rm -rf html ; mkdir html; cd html ; jade -t sgml -c ../${CATALOG} -d ${DSSSL_HTML} ../${DOCFILE} > /dev/null; cp book1.html index.html; GZIP='-9' tar czf ../html.tar.gz *; cd ..)
 
 .PHONY: tex
 tex: ${TEXFILE}
@@ -75,7 +78,7 @@ ${TEXFILE}: ${DOCFILES}
 .PHONY: pdf
 pdf: ${PDFFILE}
 
-${PDFFILE}: ${TEXFILE}
+${PDFFILE}: ${DOCFILES}
        @pdfjadetex -interaction=batchmode '\pdfcompresslevel=9' '\input ${TEXFILE}' > /dev/null
        @pdfjadetex -interaction=batchmode '\pdfcompresslevel=9' '\input ${TEXFILE}' > /dev/null
        @pdfjadetex -interaction=batchmode '\pdfcompresslevel=9' '\input ${TEXFILE}' > /dev/null
@@ -98,11 +101,10 @@ ${PSFILE}: ${DVIFILE}
 
 .PHONY: clean
 clean: 
-       @rm -f *~ *.bak *.orig \#*\# .\#*
+       @rm -f *~ *.bak *.orig \#*\# .\#* 
+       @rm -rf html ${PSFILE}
        @rm -f ${TMPFILES}
        @rm -f  ${DVIFILE} ${TEXFILE}
 
 .PHONY: distclean
 distclean: clean
-       @rm -rf html
-       @rm -f ${PSFILE} ${PDFFILE}

diff --git a/doc/clsql.pdf b/doc/clsql.pdf
new file mode 100644 (file)
index 0000000..e5d68d4
Binary files /dev/null and b/doc/clsql.pdf differ

diff --git a/doc/html.tar.gz b/doc/html.tar.gz
new file mode 100644 (file)
index 0000000..88b95ff
Binary files /dev/null and b/doc/html.tar.gz differ