From 92d38df025696d06a41ae221a9c28b978ca5a03c Mon Sep 17 00:00:00 2001
From: "Kevin M. Rosenberg" <kevin@rosenberg.net>
Date: Thu, 20 Jun 2002 19:00:09 +0000
Subject: [PATCH] r2163: *** empty log message ***

---
 debian/rules | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/debian/rules b/debian/rules
index 37acf12..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 --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.
-- 
2.34.1