X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=debian%2Frules;h=6ba6132e0e311150029e650ad2a14b1365526396;hb=ba4362935b15961739de2e056eba98ccfa08f326;hp=1b29e9b48c575fe2bb93477dde64023893541c9b;hpb=334e4fc54c9f7cbf3a3db584102d6108f9638ebe;p=uffi.git

diff --git a/debian/rules b/debian/rules
index 1b29e9b..6ba6132 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,15 +5,12 @@ export DH_COMPAT=4
 pkg	:= uffi
 debpkg  := cl-uffi
 
-UPSTREAM_VER	:= $(shell sed -n -e "s/${debpkg} (\(.*\)-[0-9.]).*/\1/p" < debian/changelog |head -1)
 
-pkg-ver		:= $(debpkg)-$(UPSTREAM_VER)
 clc-source	:= usr/share/common-lisp/source
 clc-systems	:= usr/share/common-lisp/systems
-clc-uffi	:= $(clc-source)/$(pkg)-$(UPSTREAM_VER)
+clc-uffi	:= $(clc-source)/$(pkg)
 
-doc-dir		:= usr/share/doc/${debpkg}
-lispfiles	:= $(clc-uffi)
+doc-dir		:= usr/share/doc/$(debpkg)
 
 
 configure: configure-stamp
@@ -49,12 +46,13 @@ install: build
 	dh_testroot
 	dh_clean -k
 	dh_installdirs --all $(clc-systems) $(clc-source) 
-	dh_installdirs -p $(debpkg) $(doc-dir) $(lispfiles)/mcl 
+	dh_installdirs -p $(debpkg) $(doc-dir) $(clc-uffi)/src-main $(clc-uffi)/src-mcl 
 
 	# Add here commands to install the package into debian/uffi.
-	dh_install "uffi.system" $(clc-systems)
-	dh_install "src/*.cl" $(lispfiles)
-	dh_install "src/mcl/*.cl" $(lispfiles)/mcl
+	dh_install uffi.asd $(clc-uffi)
+	dh_install "src-main/*.cl" $(clc-uffi)/src-main
+	dh_install "src-mcl/*.cl" $(clc-uffi)/src-mcl
+	dh_link $(clc-uffi)/uffi.asd $(clc-systems)/uffi.asd
 
 	rm -rf doc/html
 	(cd doc; tar xzf html.tar.gz; cd ..)
@@ -89,7 +87,6 @@ binary-arch: build install
 	dh_strip
 	dh_compress
 	dh_fixperms
-	dh_link -p $(debpkg) $(clc-uffi) $(clc-source)/$(pkg)
 #	dh_makeshlibs
 	dh_installdeb
 #	dh_perl