r2163: *** empty log message ***

diff --git a/debian/rules b/debian/rules
index 37acf127ecb4b6437a0c54b897d82cbf100d2576..7e45f30f98cb6455bc4ef77c39a4db4336da8b3e 100755 (executable)
--- 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 --all $(clc-systems) $(clc-source) $(DOCDIR)/html \
-                               $(srcdir)/mcl 
+       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) $(srcdir)
-       $(INSTALL) $(INSTALLFLAGS) $(shell echo src/mcl/*.cl) $(srcdir)/mcl
+       $(INSTALL) $(INSTALLFLAGS) $(shell echo src/*.cl *.system) $(lispfiles)
+       $(INSTALL) $(INSTALLFLAGS) $(shell echo src/mcl/*.cl) $(lispfiles)/mcl
 
-       $(INSTALL) $(INSTALLFLAGS) doc/html/* $(DOCDIR)/html
+       $(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.