r2219: *** empty log message ***

[clsql.git] / debian / rules

diff --git a/debian/rules b/debian/rules
index 064c2d5e6f8d3af69cca2b987ae29248c53bc9d6..eb0a5bb58f74e667da48a5a2d443106fb7686fcb 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-base)/usr/share/doc/cl-sql
+doc-dir                := $(prefix-base)/usr/share/doc/cl-sql-base
 
 clc-clsql      := $(clc-source)/$(plain-pkg)-$(UPSTREAM_VER)
 
@@ -54,9 +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
+sodir-base-uffi := $(prefix-base)/usr/lib/clsql
 lispdir-mysql  := $(prefix-mysql)/$(clc-clsql)/interfaces/mysql
-sodir-mysql    := $(prefix-mysql)/usr/lib/cl-sql
+sodir-mysql    := $(prefix-mysql)/usr/lib/clsql
 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
@@ -126,7 +126,7 @@ install: build
 
        # Documentation
        rm -rf doc/html
-       tar xzf doc/html.tar.gz
+       (cd doc; tar xzf html.tar.gz; cd ..)
        $(INSTALL) $(INSTALLFLAGS) doc/html/* $(doc-dir)/html
        rm -rf doc/html
        cp doc/clsql.pdf doc/cl-sql.pdf