-clc-clsql := $(clc-source)/$(plain-pkg)-$(UPSTREAM_VER)
-
-lispdir := $(clc-clsql)
-lispdir-sql := $(clc-clsql)/sql
-lispdir-base := $(clc-clsql)/base
-lispdir-base-uffi := $(clc-clsql)/interfaces/clsql-uffi
-sodir-base-uffi := usr/lib/clsql
-lispdir-mysql := $(clc-clsql)/interfaces/mysql
+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