r1998: *** empty log message ***

diff --git a/clsql.system b/clsql.system
index 976ca20fa61ae19126206572baf3c34ac66399a5..059f20ff858396752576f63797ab1dcb607e18fc 100644 (file)
--- a/clsql.system
+++ b/clsql.system
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: clsql.system,v 1.10 2002/05/13 00:57:42 kevin Exp $
+;;;; $Id: clsql.system,v 1.11 2002/05/13 02:06:02 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -19,8 +19,11 @@
 (declaim (optimize (debug 3) (speed 3) (safety 1) (compilation-speed 0)))
 (in-package :cl-user)
 
-(load (make-pathname :name "set-cl-library" :type "cl"
-                    :defaults *load-truename*))
+;; For use with non-Debian installations
+(let ((helper-pathname (make-pathname :name "set-cl-library" :type "cl"
+                                     :defaults *load-truename*)))
+  (when (probe-file helper-pathname)
+    (load helper-pathname)))
 
 ;;; System definitions
 

diff --git a/debian/cl-sql-base.dirs b/debian/cl-sql-base.dirs
new file mode 100644 (file)
index 0000000..4e9055b
--- /dev/null
+++ b/debian/cl-sql-base.dirs
@@ -0,0 +1,10 @@
+usr
+usr/share
+usr/share/common-lisp
+usr/share/common-lisp/systems
+usr/share/common-lisp/source
+usr/share/common-lisp/repositories
+usr/share/common-lisp/repositories/clsql
+
+
+

diff --git a/debian/cl-sql.dirs b/debian/cl-sql.dirs
index 767ea06cff8330de537b727cc8cff12ea4cd91d8..602868a695bd161e89100034ca430987514219e4 100644 (file)
--- a/debian/cl-sql.dirs
+++ b/debian/cl-sql.dirs
@@ -4,8 +4,11 @@ usr/share/common-lisp
 usr/share/common-lisp/systems
 usr/share/common-lisp/source
 usr/share/common-lisp/repositories
+usr/share/common-lisp/repositories/clsql
 usr/share/doc
 usr/share/doc/cl-sql
+usr/share/doc/cl-sql/html
+
 
 
 

diff --git a/debian/control b/debian/control
index c3446fd4816f5dcbf1a69202fb43b2ec73a5ab48..b0708426b5019f0d32101edc9420e7a5a6b00721 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -44,6 +44,3 @@ Provides: cl-sql-backend
 Description: UncommonSQL database backend, PostgreSQL
  This package enables you to use the CLSQL data access package
  with PostgreSQL databases via a socket interface.
-
-
-

diff --git a/debian/rules b/debian/rules
index 9cd5d6dd36f29b277aec81145805ad69b2fbd9f0..1011b6245ca810564a05311f22e9f7a71eb3e52e 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -25,7 +25,6 @@ prefix-pg-socket := debian/$(pkg-pg-socket)
 ## lisp sources per pkg
 ##
 srcs           := sql/pool.cl sql/sql.cl sql/transactions.cl sql/utils.cl sql/functional.cl sql/usql.cl
-                  $(filter-out sql/metadata.lisp,$(wildcard sql/*.lisp))
 srcs-base      := sql/package.cl sql/db-interface.cl sql/classes.cl sql/conditions.cl $(wilcard cmu-compat/*.cl)
 srcs-mysql     := $(wildcard interfaces/mysql/*.cl)
 srcs-pg                := $(wildcard interfaces/postgresql/*.cl)
@@ -35,9 +34,10 @@ INSTALL      := install
 INSTALLFLAGS   := -g root -o root -m 0644
 INSTALLDIRFLAGS        := -d -g root -o root -m 0755
 
-clc-source     := /usr/share/common-lisp/source
-clc-repositories:= /usr/share/common-lisp/repositories/clsql
-clc-systems    := /usr/share/common-lisp/systems
+clc-base       := usr/share/common-lisp
+clc-source     := $(clc-base)/source
+clc-repos      := $(clc-base)/repositories
+clc-systems    := $(clc-base)/systems
 doc-dir                := $(prefix)/usr/share/doc/cl-sql
 
 
@@ -68,19 +68,13 @@ install: build
        dh_clean -k
        dh_installdirs
 
-       # CLSQL-Base
-       $(INSTALL) $(INSTALLFLAGS) clsql.system.debian $(SYSDIR)
-       mv $(SYSDIR)/clsql.system.debian $(SYSDIR)/clsql.system
-       $(INSTALL) $(INSTALLFLAGS) $(shell echo sql/*.cl) $(REPOSITORYDIR)/sql
-       $(INSTALL) $(INSTALLFLAGS) $(shell echo src/interfaces/*.cl) $(REPOSITORYDIR)/interfaces
+       $(INSTALL) $(INSTALLFLAGS) $(srcs-base) $(prefix-base)/$(clc-repos)/clsql
+       $(INSTALL) $(INSTALLFLAGS) $(srcs) $(prefix)/$(clc-repos)/clsql
+       $(INSTALL) $(INSTALLFLAGS) $(srcs-mysql) $(prefix-mysql)/$(clc-repos)/clsql/interfaces/mysql
+       $(INSTALL) $(INSTALLFLAGS) $(srcs-pg) $(prefix-pg)/$(clc-repos)/clsql/interfaces/postgresql
+       $(INSTALL) $(INSTALLFLAGS) $(srcs-pg-socket) $(prefix-pg-socket)/$(clc-repos)/clsql/interfaces/postgresql-socket
 
-       # Documentation
-       $(INSTALL) $(INSTALLFLAGS) doc/html/* $(DOCDIR)/html
-       cp doc/clsql.pdf doc/cl-sql.pdf
-       rm -f doc/cl-sql.pdf.gz
-       gzip doc/cl-sql.pdf
-       $(INSTALL) $(INSTALLFLAGS) doc/cl-sql.pdf.gz $(DOCDIR)
-       rm -f doc/cl-sql.pdf.gz
+       dh_link ../repositories/clsql $(prefix-base)/$(clc-source)/clsql
 
        # CLC Systems
        $(INSTALL) $(INSTALLFLAGS) clsql.system $(prefix)/$(clc-systems)/
@@ -89,6 +83,14 @@ install: build
        $(INSTALL) $(INSTALLFLAGS) clsql-postgresql.system $(prefix-pg)/$(clc-systems)/
        $(INSTALL) $(INSTALLFLAGS) clsql-postgresql-socket.system $(prefix-pg-socket)/$(clc-systems)/
 
+       # Documentation
+       $(INSTALL) $(INSTALLFLAGS) doc/html/* $(doc-dir)/html
+       cp doc/clsql.pdf doc/cl-sql.pdf
+       rm -f doc/cl-sql.pdf.gz
+       gzip doc/cl-sql.pdf
+       $(INSTALL) $(INSTALLFLAGS) doc/cl-sql.pdf.gz $(doc-dir)
+       rm -f doc/cl-sql.pdf.gz
+
 
 # Build architecture-independent files here.
 binary-indep: build install
@@ -101,7 +103,7 @@ binary-arch: build install
        dh_testroot
 #      dh_installdebconf       
        dh_installdocs
-       dh_installexamples examples/*.cl
+#      dh_installexamples 
 #      dh_installmenu
 #      dh_installlogrotate
 #      dh_installemacsen
@@ -127,4 +129,3 @@ binary-arch: build install
 
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary install configure
-

diff --git a/set-cl-library.cl b/set-cl-library.cl
index fc9e6fc82785be2c0db306321a8a861e8573ba06..1d18e5ef4de9141122f66bb764bac12ca56ea10f 100644 (file)
--- a/set-cl-library.cl
+++ b/set-cl-library.cl
@@ -37,9 +37,7 @@
                                  (concatenate 'string
                                               "CL-LIBRARY:" base-dir ";"))))
               (unless (equalp dir (pathname-directory logical-dir))
-                (error 
-                 (format nil "~S does not equal ~S"
-                         dir (pathname-directory logical-dir)))))))
-                       
-
-            ))
+                (let ((*print-circle* nil))
+                  (error "CL-LIBRARY:~A; directory ~S does not equal *load-truename*'s directory ~S"
+                         base-dir (cdr dir)
+                         (cdr (pathname-directory logical-dir))))))))