X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=debian%2Frules;h=eb0a5bb58f74e667da48a5a2d443106fb7686fcb;hb=b0f9b865e7581f8c1691fe37fecc2c4673359222;hp=f6cdeef8e8d8b03ff87c9457a84d54770036c2e1;hpb=d58e70bf6153ab3c1a59332f622a8b21d112faa6;p=clsql.git

diff --git a/debian/rules b/debian/rules
index f6cdeef..eb0a5bb 100755
--- 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
@@ -125,7 +125,10 @@ install: build
 	$(INSTALL) $(INSTALLFLAGS) test-suite/tester-clsql.cl test-suite/acl-compat-tester.cl $(doc-dir)/test-suite
 
 	# Documentation
+	rm -rf doc/html
+	(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
 	rm -f doc/cl-sql.pdf.gz
 	gzip doc/cl-sql.pdf