X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=debian%2Frules;h=46cdd6333e7ed15c7c237c9566a037cfadc66514;hp=b3b2b0bb2b88c1bf40c3684c5c0a81dca0ea46bb;hb=2434b58ef00a7f6c5915c86b25a891c4adda79e4;hpb=70e3b36360363488e1296e6f7f4edb57721a8903

diff --git a/debian/rules b/debian/rules
index b3b2b0b..46cdd63 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,43 +12,50 @@ plain-pkg	:= clsql
 
 pkg		:= cl-sql
 pkg-base	:= cl-sql-base
+pkg-uffi	:= cl-sql-uffi
 pkg-mysql	:= cl-sql-mysql
 pkg-pg		:= cl-sql-postgresql
 pkg-pg-socket	:= cl-sql-postgresql-socket
 pkg-aodbc	:= cl-sql-aodbc
-all-pkgs	:= $(pkg) $(pkg-base) $(pkg-mysql) $(pkg-pg) $(pkg-pg-socket) $(pkg-aodbc)
+all-pkgs	:= $(pkg) $(pkg-base) $(pkg-uffi) $(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)
+srcs		:= sql clsql.asd
+srcs-base	:= $(wildcard base/*.cl) 
+srcs-uffi	:= $(wildcard uffi/*.cl) $(wildcard uffi/*.c)
+srcs-uffi-so	:= $(wildcard uffi/*.so)
+srcs-mysql	:= $(wildcard db-mysql/*.cl) $(wildcard db-mysql/*.c)
+srcs-mysql-so	:=  $(wildcard db-mysql/*.so)
+srcs-pg		:= $(wildcard db-postgresql/*.cl)
+srcs-pg-socket	:= $(wildcard db-postgresql-socket/*.cl)
+srcs-aodbc	:= $(wildcard db-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
+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
-lispdir-pg	:= $(clc-source)/clsql-postgresql
-lispdir-pg-socket := $(clc-source)/clsql-postgresql-socket
-lispdir-aodbc	:= $(clc-source)/clsql-aodbc
+clc-pg		:= $(clc-source)/clsql-postgresql
+lispdir-pg	:= $(clc-pg)/db-postgresql
+clc-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
 
 
 configure: configure-stamp
@@ -79,9 +86,9 @@ install: build
 	dh_testroot
 	dh_clean -k
 	dh_installdirs --all  $(clc-systems) $(clc-source)
-
 	dh_installdirs -p $(pkg) $(lispdir-sql)
-	dh_installdirs -p $(pkg-base) $(lispdir-base) $(lispdir-base-uffi) $(sodir-base-uffi)
+	dh_installdirs -p $(pkg-base) $(lispdir-base)
+	dh_installdirs -p $(pkg-uffi) $(lispdir-uffi) $(sodir-uffi)
 	dh_installdirs -p $(pkg-pg) $(lispdir-pg)
 	dh_installdirs -p $(pkg-pg-socket) $(lispdir-pg-socket)
 	dh_installdirs -p $(pkg-mysql) $(lispdir-mysql) $(sodir-mysql)
@@ -89,25 +96,36 @@ install: build
 
 	# Main package
 	dh_install -p $(pkg) $(srcs) $(lispdir-sql)
+	dh_install -p $(pkg) clsql.asd $(clc-clsql)
 
 	# Base
 	dh_install -p $(pkg-base) $(srcs-base) $(lispdir-base)
-	dh_install -p $(pkg-base) $(srcs-base-uffi) $(lispdir-base-uffi)
-	dh_install -p $(pkg-base) $(srcs-base-uffi-so) $(sodir-base-uffi)
+	dh_install -p $(pkg-base) clsql-base.asd $(clc-base)
+
+	# UFFI
+	dh_install -p $(pkg-uffi) $(srcs-uffi) $(lispdir-uffi)
+	dh_install -p $(pkg-uffi) $(srcs-uffi-so) $(sodir-uffi)
+	dh_install -p $(pkg-uffi) clsql-uffi.asd $(clc-uffi)
 
+	# Backends
 	dh_install -p $(pkg-mysql) $(srcs-mysql) $(lispdir-mysql)
+	dh_install -p $(pkg-mysql) clsql-mysql.asd $(clc-mysql)
 	dh_install -p $(pkg-mysql) $(srcs-mysql-so) $(sodir-mysql)
 	dh_install -p $(pkg-pg) $(srcs-pg) $(lispdir-pg)
+	dh_install -p $(pkg-pg) clsql-postgresql.asd $(clc-pg)
 	dh_install -p $(pkg-pg-socket) $(srcs-pg-socket) $(lispdir-pg-socket)
+	dh_install -p $(pkg-pg-socket) clsql-postgresql-socket.asd $(clc-pg-socket)
 	dh_install -p $(pkg-aodbc) $(srcs-aodbc) $(lispdir-aodbc)
+	dh_install -p $(pkg-aodbc) clsql-aodbc.asd $(clc-aodbc)
 
 	# CLC Systems
-	dh_install -p $(pkg) clsql.system $(clc-systems)
-	dh_install -p $(pkg-base) clsql-base.system clsql-uffi.system $(clc-systems)
-	dh_install -p $(pkg-mysql) clsql-mysql.system $(clc-systems)
-	dh_install -p $(pkg-pg) clsql-postgresql.system $(clc-systems)
-	dh_install -p $(pkg-pg-socket) clsql-postgresql-socket.system $(clc-systems)
-	dh_install -p $(pkg-aodbc) clsql-aodbc.system $(clc-systems)
+	dh_link -p $(pkg) $(clc-clsql)/clsql.asd $(clc-systems)/clsql.asd
+	dh_link -p $(pkg-base) $(clc-base)/clsql-base.asd $(clc-systems)/clsql-base.asd
+	dh_link -p $(pkg-uffi) $(clc-uffi)/clsql-uffi.asd $(clc-systems)/clsql-uffi.asd
+	dh_link -p $(pkg-mysql) $(clc-mysql)/clsql-mysql.asd $(clc-systems)/clsql-mysql.asd
+	dh_link -p $(pkg-pg) $(clc-pg)/clsql-postgresql.asd $(clc-systems)/clsql-postgresql.asd
+	dh_link -p $(pkg-pg-socket) $(clc-pg-socket)/clsql-postgresql-socket.asd $(clc-systems)/clsql-postgresql-socket.asd
+	dh_link -p $(pkg-aodbc) $(clc-aodbc)/clsql-aodbc.asd $(clc-systems)/clsql-aodbc.asd
 
 	# Test suite
 	dh_installdirs -p $(pkg) $(doc-dir)/html $(doc-dir)/test-suite
@@ -124,7 +142,6 @@ install: build
 	dh_install -p $(pkg) doc/cl-sql.pdf.gz $(doc-dir)
 	rm -f doc/cl-sql.pdf.gz
 
-#	From UncommonSQL Debian package: build prerm postinst from templates
 	set -e ;\
 	for p in $(all-pkgs); do \
                 echo "processing maintainer scripts for $$p" ;\
@@ -132,7 +149,7 @@ install: build
 		sed -e "s/%%/$$l/;" debian/preinst.template > debian/$$p.preinst ;\
 		sed -e "s/%%/$$l/;" debian/prerm.template > debian/$$p.prerm ;\
 		sed -e "s/%%/$$l/;" debian/postinst.template > debian/$$p.postinst ;\
-		chown root.root debian/$$p.prerm debian/$$p.prerm debian/$pp.preinst; \
+		chown root.root debian/$$p.prerm debian/$$p.prerm debian/$$p.preinst; \
 		chmod +x debian/$$p.prerm debian/$$p.prerm debian/$$p.preinst; \
 	done