X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=debian%2Frules;h=e5d79d9e6724f36535300d7ede15147d1493d614;hb=610dc771df7c029185c2c36e1212f209877984ef;hp=ba65d8ccf11692cf9a492135f1ef0d067e837bf2;hpb=21d8b75468dac2a79ae1769ed3e8b0ac577cd434;p=clsql.git

diff --git a/debian/rules b/debian/rules
index ba65d8c..e5d79d9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,7 +25,6 @@ prefix-aodbc	:= debian/$(pkg-aodbc)
 
 ## Lisp sources
 srcs		:= $(wildcard sql/*.cl)
-srcs-cmucl-compat:= $(wildcard cmucl-compat/*.cl)
 srcs-base	:= $(wildcard base/*.cl)
 srcs-base-uffi	:= $(wildcard interfaces/clsql-uffi/*.cl) 
 srcs-base-uffi-so:= $(wildcard interfaces/clsql-uffi/*.so)
@@ -42,7 +41,6 @@ INSTALLDIRFLAGS	:= -d -g root -o root -m 0755
 
 clc-base	:= usr/share/common-lisp
 clc-source	:= $(clc-base)/source
-clc-repos	:= $(clc-base)/repositories
 clc-systems	:= $(clc-base)/systems
 doc-dir		:= $(prefix)/usr/share/doc/cl-sql
 
@@ -77,23 +75,22 @@ install: build
 	dh_installdirs
 
 	# Main package
-	$(INSTALL) $(INSTALLFLAGS) $(srcs) $(prefix)/$(clc-repos)/clsql/sql
-	$(INSTALL) $(INSTALLFLAGS) $(srcs-cmucl-compat) $(prefix)/$(clc-repos)/clsql/cmucl-compat
+	$(INSTALL) $(INSTALLFLAGS) $(srcs) $(prefix)/$(clc-source)/clsql/sql
 
 	# Base
-	$(INSTALL) $(INSTALLFLAGS) $(srcs-base) $(prefix-base)/$(clc-repos)/clsql/base
-	$(INSTALL) $(INSTALLFLAGS) $(srcs-base-uffi) $(prefix-base)/$(clc-repos)/clsql/interfaces/clsql-uffi
-	$(INSTALL) $(INSTALLEXECFLAGS) $(srcs-base-uffi-so) $(prefix-base)/$(clc-repos)/clsql/interfaces/clsql-uffi
+	$(INSTALL) $(INSTALLFLAGS) $(srcs-base) $(prefix-base)/$(clc-source)/clsql/base
+	$(INSTALL) $(INSTALLFLAGS) $(srcs-base-uffi) $(prefix-base)/$(clc-source)/clsql/interfaces/clsql-uffi
+	$(INSTALL) $(INSTALLEXECFLAGS) $(srcs-base-uffi-so) $(prefix-base)/$(clc-source)/clsql/interfaces/clsql-uffi
 
-	$(INSTALL) $(INSTALLFLAGS) $(srcs-mysql) $(prefix-mysql)/$(clc-repos)/clsql/interfaces/mysql
-	$(INSTALL) $(INSTALLEXECFLAGS) $(srcs-mysql-so) $(prefix-mysql)/$(clc-repos)/clsql/interfaces/mysql
-	$(INSTALL) $(INSTALLFLAGS) $(srcs-pg) $(prefix-pg)/$(clc-repos)/clsql/interfaces/postgresql
-	$(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
+	$(INSTALL) $(INSTALLFLAGS) $(srcs-mysql) $(prefix-mysql)/$(clc-source)/clsql/interfaces/mysql
+	$(INSTALL) $(INSTALLEXECFLAGS) $(srcs-mysql-so) $(prefix-mysql)/$(clc-source)/clsql/interfaces/mysql
+	$(INSTALL) $(INSTALLFLAGS) $(srcs-pg) $(prefix-pg)/$(clc-source)/clsql/interfaces/postgresql
+	$(INSTALL) $(INSTALLFLAGS) $(srcs-pg-socket) $(prefix-pg-socket)/$(clc-source)/clsql/interfaces/postgresql-socket
+	$(INSTALL) $(INSTALLFLAGS) $(srcs-aodbc) $(prefix-aodbc)/$(clc-source)/clsql/interfaces/aodbc
 
 	# CLC Systems
 	$(INSTALL) $(INSTALLFLAGS) clsql.system $(prefix)/$(clc-systems)/
-	$(INSTALL) $(INSTALLFLAGS) clsql-base.system $(prefix-base)/$(clc-systems)/
+	$(INSTALL) $(INSTALLFLAGS) clsql-base.system clsql-uffi.system $(prefix-base)/$(clc-systems)/
 	$(INSTALL) $(INSTALLFLAGS) clsql-mysql.system $(prefix-mysql)/$(clc-systems)/
 	$(INSTALL) $(INSTALLFLAGS) clsql-postgresql.system $(prefix-pg)/$(clc-systems)/
 	$(INSTALL) $(INSTALLFLAGS) clsql-postgresql-socket.system $(prefix-pg-socket)/$(clc-systems)/
@@ -133,19 +130,18 @@ binary-arch: build install
 	dh_installdocs
 #	dh_installexamples 
 	dh_installchangelogs ChangeLog
-	dh_link -p $(pkg-base) $(clc-repos)/clsql $(clc-source)/clsql
-	dh_link -p $(pkg-base) $(clc-repos)/clsql $(clc-source)/clsql-base
-	dh_link -p $(pkg-mysql) $(clc-repos)/clsql $(clc-source)/clsql-mysql
-	dh_link -p $(pkg-pg) $(clc-repos)/clsql $(clc-source)/clsql-postgresql
-	dh_link -p $(pkg-pg-socket) $(clc-repos)/clsql $(clc-source)/clsql-postgresql-socket
-	dh_link -p $(pkg-aodbc) $(clc-repos)/clsql $(clc-source)/clsql-aodbc
+	dh_link -p $(pkg-base) $(clc-source)/clsql $(clc-source)/clsql-base
+	dh_link -p $(pkg-mysql) $(clc-source)/clsql $(clc-source)/clsql-mysql
+	dh_link -p $(pkg-pg) $(clc-source)/clsql $(clc-source)/clsql-postgresql
+	dh_link -p $(pkg-pg-socket) $(clc-source)/clsql $(clc-source)/clsql-postgresql-socket
+	dh_link -p $(pkg-aodbc) $(clc-source)/clsql $(clc-source)/clsql-aodbc
 	dh_strip
 	dh_compress
 	dh_fixperms
 #	dh_makeshlibs
 	dh_installdeb
 #	dh_perl
-#	dh_shlibdeps
+	dh_shlibdeps
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb