X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=debian%2Frules;h=546fb343a5b7ec9d3dc39866e0c3f3cc561c8a25;hb=47e52613ef222baea8386e82bae4bfa5717e91ce;hp=eca1e9409c863fe09f9bb3e8527992943562f10b;hpb=19cf80c6302bb403031d11e0742bd7e7cecff8f0;p=clsql.git

diff --git a/debian/rules b/debian/rules
index eca1e94..546fb34 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,6 +8,8 @@ export DH_VERBOSE=1
 # This is the debhelper compatibility version to use.
 export DH_COMPAT=4
 
+plain-pkg	:= clsql
+
 pkg		:= cl-sql
 pkg-base	:= cl-sql-base
 pkg-mysql	:= cl-sql-mysql
@@ -46,16 +48,16 @@ clc-source	:= $(clc-base)/source
 clc-systems	:= $(clc-base)/systems
 doc-dir		:= $(prefix)/usr/share/doc/cl-sql
 
-clc-clsql	:= $(clc-source)/$(pkg)-$(UPSTREAM_VER)
+clc-clsql	:= $(clc-source)/$(plain-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-aodbc)/$(clc-clsql)/aodbc
+lispdir-mysql	:= $(prefix-mysql)/$(clc-clsql)/interfaces/mysql
+lispdir-pg	:= $(prefix-pg)/$(clc-clsql)/interfaces/postgresql
+lispdir-pg-socket := $(prefix-pg-socket)/$(clc-clsql)/interfaces/postgresql-socket
+lispdir-aodbc	:= $(prefix-aodbc)/$(clc-clsql)/interfaces/aodbc
 
 
 configure: configure-stamp
@@ -85,7 +87,7 @@ install: build
 	dh_testdir
 	dh_testroot
 	dh_clean -k
-	dh_installdirs -all -i $(clc-systems) $(clc-source)
+	dh_installdirs --all  $(clc-systems) $(clc-source)
 
 	$(INSTALL) $(INSTALLDIRFLAGS) $(lispdir) $(lispdir-base) \
 		$(lispdir-base-uffi) $(lispdir-pg) $(lispdir-pg-socket) \
@@ -107,12 +109,12 @@ install: build
 	$(INSTALL) $(INSTALLFLAGS) $(srcs-aodbc) $(lispdir-aodbc)
 
 	# CLC Systems
-	$(INSTALL) $(INSTALLFLAGS) clsql.system $(prefix)/$(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)/
+	$(INSTALL) $(INSTALLFLAGS) clsql.system $(prefix)/$(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