X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=debian%2Frules;h=7e45f30f98cb6455bc4ef77c39a4db4336da8b3e;hb=92d38df025696d06a41ae221a9c28b978ca5a03c;hp=1450c4c2a68ef4d83170648a44912b88f0d4f912;hpb=8c8440d0681afef840611e93a905c49f7f8b172f;p=uffi.git

diff --git a/debian/rules b/debian/rules
index 1450c4c..7e45f30 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,8 +16,16 @@ INSTALL	:= install
 INSTALLFLAGS	:= -g root -o root -m 0644
 INSTALLDIRFLAGS	:= -d -g root -o root -m 0755
 
-SOURCEDIR	:= $(prefix)/usr/share/common-lisp/source/${pkg}
-DOCDIR		:= $(prefix)/usr/share/doc/${debpkg}
+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)
+
+pkg-doc		:= usr/share/doc/${debpkg}
+lispfiles	:= $(prefix)/$(clc-uffi)
+docfiles	:= $(prefix)/$(pkg-doc)
 
 
 configure: configure-stamp
@@ -54,23 +62,24 @@ install: build
 	dh_testdir
 	dh_testroot
 	dh_clean -k
-	dh_installdirs
+	dh_installdirs --all $(clc-systems) $(clc-source) 
+	dh_installdirs -p $(debpkg) $(pkg-doc)/html $(clc-uffi)/mcl 
 
 	# Add here commands to install the package into debian/uffi.
-	$(INSTALL) $(INSTALLFLAGS) $(shell echo src/*.cl *.system) $(SOURCEDIR)
-	$(INSTALL) $(INSTALLFLAGS) $(shell echo src/mcl/*.cl) $(SOURCEDIR)/mcl
-	$(INSTALL) $(INSTALLFLAGS) doc/html/* $(DOCDIR)/html
+	$(INSTALL) $(INSTALLFLAGS) $(shell echo src/*.cl *.system) $(lispfiles)
+	$(INSTALL) $(INSTALLFLAGS) $(shell echo src/mcl/*.cl) $(lispfiles)/mcl
+
+	$(INSTALL) $(INSTALLFLAGS) doc/html/* $(docfiles)/html
 	cp doc/uffi.pdf doc/cl-uffi.pdf
 	rm -f doc/cl-uffi.pdf.gz
 	gzip doc/cl-uffi.pdf
-	$(INSTALL) $(INSTALLFLAGS) doc/cl-uffi.pdf.gz $(DOCDIR)
+	$(INSTALL) $(INSTALLFLAGS) doc/cl-uffi.pdf.gz $(docfiles)
 	rm -f doc/cl-uffi.pdf.gz
 
 # Build architecture-independent files here.
 binary-indep: build install
 
 
-
 # Build architecture-dependent files here.
 binary-arch: build install
 	dh_testdir
@@ -89,10 +98,10 @@ binary-arch: build install
 #	dh_installinfo
 #	dh_undocumented
 	dh_installchangelogs ChangeLog
-	dh_link
 	dh_strip
 	dh_compress
 	dh_fixperms
+	dh_link -p $(debpkg) $(clc-uffi) $(clc-source)/$(pkg)
 #	dh_makeshlibs
 	dh_installdeb
 #	dh_perl