-lispdir-pg := $(clc-clsql)/interfaces/postgresql
-lispdir-pg-socket := $(clc-clsql)/interfaces/postgresql-socket
-lispdir-aodbc := $(clc-clsql)/interfaces/aodbc
-
+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
+clc-odbc := $(clc-source)/clsql-odbc
+lispdir-odbc := $(clc-odbc)/db-odbc
+clc-sqlite := $(clc-source)/clsql-sqlite
+lispdir-sqlite := $(clc-sqlite)/db-sqlite
+clc-sqlite3 := $(clc-source)/clsql-sqlite3
+lispdir-sqlite3 := $(clc-sqlite3)/db-sqlite3
+clc-oracle := $(clc-source)/clsql-oracle
+lispdir-oracle := $(clc-oracle)/db-oracle
+clc-tests := $(clc-source)/clsql-tests
+lispdir-tests := $(clc-tests)/tests