r2200: Auto commit for Debian build

[clsql.git] / debian / rules

diff --git a/debian/rules b/debian/rules
index 8594c37805c89804e53e7c9c3a1d63bb4b733cb5..e934d0a43290750cf7395b8a8f0ecdf11cb4bed3 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -8,6 +8,8 @@ export DH_VERBOSE=1
 # This is the debhelper compatibility version to use.
 export DH_COMPAT=4
 
+plain-pkg      := clsql
+
 pkg            := cl-sql
 pkg-base       := cl-sql-base
 pkg-mysql      := cl-sql-mysql
@@ -44,18 +46,20 @@ 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)/$(pkg)-$(UPSTREAM_VER)
+clc-clsql      := $(clc-source)/$(plain-pkg)-$(UPSTREAM_VER)
 
 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
-lispdir-mysql  := $(prefix-mysql)/$(clc-clsql)/mysql
-lispdir-pg     := $(prefix-pg)/$(clc-clsql)/postgresql
-lispdir-pg-socket := $(prefix-pg-socket)/$(clc-clsql)/postgresql-socket
-lispdir-aodbc  := $(prefix-aodbc)/$(clc-clsql)/aodbc
+sodir-base-uffi := $(prefix-base)/usr/lib/clsql
+lispdir-mysql  := $(prefix-mysql)/$(clc-clsql)/interfaces/mysql
+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
 
 
 configure: configure-stamp
@@ -85,11 +89,12 @@ install: build
        dh_testdir
        dh_testroot
        dh_clean -k
-       dh_installdirs --all -i $(clc-systems) $(clc-source)
+       dh_installdirs --all  $(clc-systems) $(clc-source)
 
        $(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)
@@ -98,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)
@@ -120,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
@@ -150,6 +158,7 @@ binary-arch: build install
        dh_installdocs
 #      dh_installexamples 
        dh_installchangelogs ChangeLog
+       dh_link -p $(pkg-base) $(clc-clsql) $(clc-source)/clsql
        dh_link -p $(pkg-base) $(clc-clsql) $(clc-source)/clsql-base
        dh_link -p $(pkg-mysql) $(clc-clsql) $(clc-source)/clsql-mysql
        dh_link -p $(pkg-pg) $(clc-clsql) $(clc-source)/clsql-postgresql