X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;ds=sidebyside;f=debian%2Frules;h=7e45f30f98cb6455bc4ef77c39a4db4336da8b3e;hb=92d38df025696d06a41ae221a9c28b978ca5a03c;hp=ce07491aee7275d1a2a51fe4710e7e91d6e3232c;hpb=34c90592bda63fba66b892ccc71b3b043a00f2bf;p=uffi.git

diff --git a/debian/rules b/debian/rules
index ce07491..7e45f30 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,8 +23,9 @@ clc-source	:= usr/share/common-lisp/source
 clc-systems	:= usr/share/common-lisp/systems
 clc-uffi	:= $(clc-source)/$(pkg)-$(UPSTREAM_VER)
 
-srcdir		:= $(prefix)/$(clc-uffi)
-DOCDIR		:= $(prefix)/usr/share/doc/${debpkg}
+pkg-doc		:= usr/share/doc/${debpkg}
+lispfiles	:= $(prefix)/$(clc-uffi)
+docfiles	:= $(prefix)/$(pkg-doc)
 
 
 configure: configure-stamp
@@ -61,18 +62,18 @@ 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) $(INSTALLDIRFLAGS) $(srcdir)
-	$(INSTALL) $(INSTALLDIRFLAGS) $(srcdir)/mcl
-	$(INSTALL) $(INSTALLFLAGS) $(shell echo src/*.cl *.system) $(srcdir)
-	$(INSTALL) $(INSTALLFLAGS) $(shell echo src/mcl/*.cl) $(clc-source)/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.
@@ -100,7 +101,7 @@ binary-arch: build install
 	dh_strip
 	dh_compress
 	dh_fixperms
-	dh_link -p $(pkg) $(clc-uffi) $(clc-source)/$(pkg)
+	dh_link -p $(debpkg) $(clc-uffi) $(clc-source)/$(pkg)
 #	dh_makeshlibs
 	dh_installdeb
 #	dh_perl