X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=debian%2Frules;h=c2ac5e3a3b0522f67344405366d70d7e610df409;hb=72271d39a364ab849afbf8918cfc7982a59efd57;hp=fb99ebec54252504b6ec2fe8d839e337ea9387ae;hpb=5639395236a942d7ed2cc847152f2b428a70623e;p=clsql.git

diff --git a/debian/rules b/debian/rules
index fb99ebe..c2ac5e3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,7 +13,7 @@ pkg-base	:= cl-sql-base
 pkg-mysql	:= cl-sql-mysql
 pkg-pg		:= cl-sql-postgresql
 pkg-pg-socket	:= cl-sql-postgresql-socket
-pkg-mysql	:= cl-sql-aodbc
+pkg-aodbc	:= cl-sql-aodbc
 all-pkgs	:= $(pkg) $(pkg-base) $(pkg-mysql) $(pkg-pg) $(pkg-pg-socket) $(pkg-aodbc)
 
 prefix		:= debian/$(pkg)
@@ -28,7 +28,7 @@ srcs		:= sql/pool.cl sql/sql.cl sql/transactions.cl sql/utils.cl sql/functional.
 srcs-cmucl-compat := $(wildcard cmucl-compat/*.cl)
 srcs-base	:= sql/package.cl sql/db-interface.cl sql/classes.cl sql/conditions.cl
 srcs-base-uffi	:= $(wildcard interfaces/clsql-uffi/*.cl) $(wildcard interfaces/clsql-uffi/*.so)
-srcs-mysql	:= $(wildcard interfaces/mysql/*.cl) $(wildcards interfaces/mysl/*.so)
+srcs-mysql	:= $(wildcard interfaces/mysql/*.cl) $(wildcard interfaces/mysql/*.so)
 srcs-pg		:= $(wildcard interfaces/postgresql/*.cl)
 srcs-pg-socket	:= $(wildcard interfaces/postgresql-socket/*.cl)
 srcs-aodbc	:= $(wildcard interfaces/aodbc/*.cl)
@@ -74,11 +74,11 @@ install: build
 	dh_installdirs
 
 	# Main package
-	$(INSTALL) $(INSTALLFLAGS) $(srcs) $(prefix)/$(clc-repos)/clsql
+	$(INSTALL) $(INSTALLFLAGS) $(srcs) $(prefix)/$(clc-repos)/clsql/sql
 	$(INSTALL) $(INSTALLFLAGS) $(srcs-cmucl-compat) $(prefix)/$(clc-repos)/clsql/cmucl-compat
 
 	# Base
-	$(INSTALL) $(INSTALLFLAGS) $(srcs-base) $(prefix-base)/$(clc-repos)/clsql
+	$(INSTALL) $(INSTALLFLAGS) $(srcs-base) $(prefix-base)/$(clc-repos)/clsql/sql
 	$(INSTALL) $(INSTALLFLAGS) $(srcs-base-uffi) $(prefix-base)/$(clc-repos)/clsql/interfaces/clsql-uffi
 
 	$(INSTALL) $(INSTALLFLAGS) $(srcs-mysql) $(prefix-mysql)/$(clc-repos)/clsql/interfaces/mysql
@@ -86,7 +86,6 @@ install: build
 	$(INSTALL) $(INSTALLFLAGS) $(srcs-pg-socket) $(prefix-pg-socket)/$(clc-repos)/clsql/interfaces/postgresql-socket
 	$(INSTALL) $(INSTALLFLAGS) $(srcs-aodbc) $(prefix-aodbc)/$(clc-repos)/clsql/interfaces/aodbc
 
-	dh_link ../repositories/clsql $(prefix-base)/$(clc-source)/clsql
 
 	# CLC Systems
 	$(INSTALL) $(INSTALLFLAGS) clsql.system $(prefix)/$(clc-systems)/
@@ -107,6 +106,15 @@ install: build
 	$(INSTALL) $(INSTALLFLAGS) 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" ;\
+		l=`echo $$p | sed -e "s/^cl-/cl/;"` ;\
+		sed -e "s/%%/$$l/;" debian/prerm.template > debian/$$p.prerm ;\
+		sed -e "s/%%/$$l/;" debian/postinst.template > debian/$$p.postinst ;\
+	done
+
 
 # Build architecture-independent files here.
 binary-indep: build install
@@ -120,18 +128,13 @@ binary-arch: build install
 #	dh_installdebconf	
 	dh_installdocs
 #	dh_installexamples 
-#	dh_installmenu
-#	dh_installlogrotate
-#	dh_installemacsen
-#	dh_installpam
-#	dh_installmime
-#	dh_installinit
-#	dh_installcron
-#	dh_installman
-#	dh_installinfo
-#	dh_undocumented
 	dh_installchangelogs ChangeLog
-	dh_link
+	dh_link -p $(pkg) ../repositories/clsql $(clc-source)/clsql
+	dh_link -p $(pkg-base) ../repositories/clsql $(clc-source)/clsql-base
+	dh_link -p $(pkg-mysql) ../repositories/clsql $(clc-source)/clsql-mysql
+	dh_link -p $(pkg-pg) ../repositories/clsql $(clc-source)/clsql-postgresql
+	dh_link -p $(pkg-pg-socket) ../repositories/clsql $(clc-source)/clsql-postgresql-socket
+	dh_link -p $(pkg-aodbc) ../repositories/clsql $(clc-source)/clsql-aodbc
 	dh_strip
 	dh_compress
 	dh_fixperms