-all-pkgs := $(pkg) $(pkg-base) $(pkg-mysql) $(pkg-pg) $(pkg-pg-socket)
-
-prefix := debian/$(pkg)
-prefix-base := debian/$(pkg-base)
-prefix-mysql := debian/$(pkg-mysql)
-prefix-pg := debian/$(pkg-pg)
-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)
-srcs-pg-socket := $(wildcard interfaces/postgresql-socket/*.cl)
-
-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
-doc-dir := $(prefix)/usr/share/doc/cl-sql
+pkg-aodbc := cl-sql-aodbc
+all-pkgs := $(pkg) $(pkg-base) $(pkg-mysql) $(pkg-pg) $(pkg-pg-socket) $(pkg-aodbc)
+
+
+UPSTREAM_VER := $(shell sed -n -e "s/${pkg} (\(.*\)-[0-9A-Za-z\.]).*/\1/p" < debian/changelog |head -1)
+
+## Lisp sources
+srcs := $(wildcard clsql/*.cl)
+srcs-base := $(wildcard clsql-base/*.cl)
+srcs-base-uffi := $(wildcard clsql-uffi/*.cl)
+srcs-base-uffi-so:= $(wildcard clsql-uffi/*.so)
+srcs-mysql := $(wildcard clsql-mysql/*.cl)
+srcs-mysql-so := $(wildcard clsql-mysql/*.so)
+srcs-pg := $(wildcard clsql-postgresql/*.cl)
+srcs-pg-socket := $(wildcard clsql-postgresql-socket/*.cl)
+srcs-aodbc := $(wildcard clsql-aodbc/*.cl)
+
+clc-base := usr/share/common-lisp
+clc-source := $(clc-base)/source
+clc-systems := $(clc-base)/systems
+doc-dir := usr/share/doc/cl-sql-base
+
+#clc-clsql := $(clc-source)/$(plain-pkg)-$(UPSTREAM_VER)
+clc-clsql := $(clc-source)/$(plain-pkg)
+
+lispdir-sql := $(clc-source)/clsql
+lispdir-base := $(clc-source)/clsql-base
+lispdir-base-uffi := $(clc-source)/clsql-uffi
+sodir-base-uffi := usr/lib/clsql
+lispdir-mysql := $(clc-source)/clsql-mysql
+sodir-mysql := usr/lib/clsql
+lispdir-pg := $(clc-source)/clsql-postgresql
+lispdir-pg-socket := $(clc-source)/clsql-postgresql-socket
+lispdir-aodbc := $(clc-source)/clsql-aodbc