-doc-dir := $(prefix-base)/usr/share/doc/cl-sql
-
-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
-sodir-base-uffi := $(prefix-base)/usr/lib/cl-sql
-lispdir-mysql := $(prefix-mysql)/$(clc-clsql)/interfaces/mysql
-sodir-mysql := $(prefix-mysql)/usr/lib/cl-sql
-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
+doc-dir := usr/share/doc/cl-sql
+
+clc-clsql := $(clc-source)/$(plain-pkg)
+
+clc-sql := $(clc-source)/clsql
+lispdir-sql := $(clc-sql)/sql
+clc-base := $(clc-source)/clsql-base
+lispdir-base := $(clc-base)/base
+clc-uffi := $(clc-source)/clsql-uffi
+lispdir-uffi := $(clc-uffi)/uffi
+sodir-uffi := usr/lib/clsql
+clc-mysql := $(clc-source)/clsql-mysql
+lispdir-mysql := $(clc-mysql)/db-mysql
+sodir-mysql := usr/lib/clsql
+clc-pg := $(clc-source)/clsql-postgresql
+lispdir-pg := $(clc-pg)/db-postgresql
+clc-pg-socket := $(clc-source)/clsql-postgresql-socket
+lispdir-pg-socket := $(clc-pg-socket)/db-postgresql-socket
+clc-aodbc := $(clc-source)/clsql-aodbc
+lispdir-aodbc := $(clc-aodbc)/db-aodbc