r2164: *** empty log message ***

[clsql.git] / debian / rules

diff --git a/debian/rules b/debian/rules
index eca1e9409c863fe09f9bb3e8527992943562f10b..c55b99e730597c1b4213a7f7a0d12d1b53eead74 100755 (executable)
--- 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,7 +48,7 @@ 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
@@ -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