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

diff --git a/debian/rules b/debian/rules
index f621732..eca1e94 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,7 +23,7 @@ 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)
+UPSTREAM_VER	:= $(shell sed -n -e "s/${pkg} (\(.*\)-[0-9.]).*/\1/p" < debian/changelog |head -1)
 
 ## Lisp sources
 srcs		:= $(wildcard sql/*.cl)
@@ -46,7 +46,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)/$(pkg)-$(UPSTREAM_VER)
 
 lispdir		:= $(prefix)/$(clc-clsql)
 lispdir-sql	:= $(prefix)/$(clc-clsql)/sql
@@ -55,7 +55,7 @@ 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
+lispdir-aodbc	:= $(prefix-aodbc)/$(clc-clsql)/aodbc
 
 
 configure: configure-stamp
@@ -93,7 +93,7 @@ install: build
 
 	# Main package
 	$(INSTALL) $(INSTALLDIRFLAGS) $(lispdir) $(lispdir-int)
-	$(INSTALL) $(INSTALLFLAGS) $(srcs) $(prefix)/$(clc-source)/clsql/sql
+	$(INSTALL) $(INSTALLFLAGS) $(srcs) $(lispdir-sql)
 
 	# Base
 	$(INSTALL) $(INSTALLFLAGS) $(srcs-base) $(lispdir-base)