X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=debian%2Frules;h=f621732161a6aa80d31f20f7f0c93702550dcd18;hb=ea007647272af8719b0ea11bb4571d84ef990b51;hp=c97f8cfcf46e694529d56d31ea963f6c9e850b9e;hpb=ddf1ef04252d64e76f2512deb4772e21d724478e;p=clsql.git

diff --git a/debian/rules b/debian/rules
index c97f8cf..f621732 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,7 @@
 export DH_VERBOSE=1
 
 # This is the debhelper compatibility version to use.
-export DH_COMPAT=3
+export DH_COMPAT=4
 
 pkg		:= cl-sql
 pkg-base	:= cl-sql-base
@@ -23,26 +23,40 @@ prefix-pg	:= debian/$(pkg-pg)
 prefix-pg-socket := debian/$(pkg-pg-socket)
 prefix-aodbc	:= debian/$(pkg-aodbc)
 
+UPSTREAM_VER	:= $(shell sed -n -e "s/${debpkg} (\(.*\)-[0-9.]).*/\1/p" < debian/changelog |head -1)
+
 ## Lisp sources
-srcs		:= sql/pool.cl sql/sql.cl sql/transactions.cl sql/utils.cl sql/functional.cl sql/usql.cl
-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) $(wildcard interfaces/mysql/*.so)
+srcs		:= $(wildcard sql/*.cl)
+srcs-base	:= $(wildcard base/*.cl)
+srcs-base-uffi	:= $(wildcard interfaces/clsql-uffi/*.cl) 
+srcs-base-uffi-so:= $(wildcard interfaces/clsql-uffi/*.so)
+srcs-mysql	:= $(wildcard interfaces/mysql/*.cl)
+srcs-mysql-so	:=  $(wildcard interfaces/mysql/*.so)
 srcs-pg		:= $(wildcard interfaces/postgresql/*.cl)
 srcs-pg-socket	:= $(wildcard interfaces/postgresql-socket/*.cl)
 srcs-aodbc	:= $(wildcard interfaces/aodbc/*.cl)
 
 INSTALL	:= install
 INSTALLFLAGS	:= -g root -o root -m 0644
+INSTALLEXECFLAGS	:= -g root -o root -m 0755
 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
 
+clc-clsql	:= $(clc-source)/$(pkg)-$(UPSTREAM_VER)	
+
+lispdir		:= $(prefix)/$(clc-clsql)
+lispdir-sql	:= $(prefix)/$(clc-clsql)/sql
+lispdir-base	:= $(prefix-base)/$(clc-clsql)/base
+lispdir-base-uffi := $(prefix-base)/$(clc-clsql)/interfaces/clsql-uffi
+lispdir-mysql	:= $(prefix-mysql)/$(clc-clsql)/mysql
+lispdir-pg	:= $(prefix-pg)/$(clc-clsql)/postgresql
+lispdir-pg-socket := $(prefix-pg-socket)/$(clc-clsql)/postgresql-socket
+lispdir-aodbc	:= $(prefix-pg)/$(clc-clsql)/aodbc
+
 
 configure: configure-stamp
 configure-stamp:
@@ -71,31 +85,38 @@ install: build
 	dh_testdir
 	dh_testroot
 	dh_clean -k
-	dh_installdirs
+	dh_installdirs -all -i $(clc-systems) $(clc-source)
+
+	$(INSTALL) $(INSTALLDIRFLAGS) $(lispdir) $(lispdir-base) \
+		$(lispdir-base-uffi) $(lispdir-pg) $(lispdir-pg-socket) \
+		$(lispdir-mysql) $(lispdir-sql) $(lispdir-aodbc)
 
 	# Main package
-	$(INSTALL) $(INSTALLFLAGS) $(srcs) $(prefix)/$(clc-repos)/clsql/sql
-	$(INSTALL) $(INSTALLFLAGS) $(srcs-cmucl-compat) $(prefix)/$(clc-repos)/clsql/cmucl-compat
+	$(INSTALL) $(INSTALLDIRFLAGS) $(lispdir) $(lispdir-int)
+	$(INSTALL) $(INSTALLFLAGS) $(srcs) $(prefix)/$(clc-source)/clsql/sql
 
 	# Base
-	$(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
-	$(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-base) $(lispdir-base)
+	$(INSTALL) $(INSTALLFLAGS) $(srcs-base-uffi) $(lispdir-base-uffi)
+	$(INSTALL) $(INSTALLEXECFLAGS) $(srcs-base-uffi-so) $(lispdir-base-uffi)
 
+	$(INSTALL) $(INSTALLFLAGS) $(srcs-mysql) $(lispdir-mysql)
+	$(INSTALL) $(INSTALLEXECFLAGS) $(srcs-mysql-so) $(lispdir-mysql)
+	$(INSTALL) $(INSTALLFLAGS) $(srcs-pg) $(lispdir-pg)
+	$(INSTALL) $(INSTALLFLAGS) $(srcs-pg-socket) $(lispdir-pg-socket)
+	$(INSTALL) $(INSTALLFLAGS) $(srcs-aodbc) $(lispdir-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)/
 	$(INSTALL) $(INSTALLFLAGS) clsql-aodbc.system $(prefix-aodbc)/$(clc-systems)/
 
 	# Test suite
+	$(INSTALL) $(INSTALLDIRFLAGS) $(doc-dir)/html $(doc-dir)/test-suite
+ 
 	$(INSTALL) $(INSTALLFLAGS) test-suite/tester-clsql.cl test-suite/acl-compat-tester.cl $(doc-dir)/test-suite
 
 	# Documentation
@@ -129,19 +150,18 @@ binary-arch: build install
 	dh_installdocs
 #	dh_installexamples 
 	dh_installchangelogs ChangeLog
-	dh_link ../repositories/clsql $(prefix)/$(clc-source)/clsql
-	dh_link ../repositories/clsql $(prefix-base)/$(clc-source)/clsql-base
-	dh_link ../repositories/clsql $(prefix-mysql)/$(clc-source)/clsql-mysql
-	dh_link ../repositories/clsql $(prefix-pg)/$(clc-source)/clsql-postgresql
-	dh_link ../repositories/clsql $(prefix-pg-socket)/$(clc-source)/clsql-postgresql-socket
-	dh_link ../repositories/clsql $(prefix-aodbc)/$(clc-source)/clsql-aodbc
+	dh_link -p $(pkg-base) $(clc-clsql) $(clc-source)/clsql-base
+	dh_link -p $(pkg-mysql) $(clc-clsql) $(clc-source)/clsql-mysql
+	dh_link -p $(pkg-pg) $(clc-clsql) $(clc-source)/clsql-postgresql
+	dh_link -p $(pkg-pg-socket) $(clc-clsql) $(clc-source)/clsql-postgresql-socket
+	dh_link -p $(pkg-aodbc) $(clc-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