From a40d8005b6254f7ffad87603376d718711c184fa Mon Sep 17 00:00:00 2001
From: "Kevin M. Rosenberg" <kevin@rosenberg.net>
Date: Tue, 16 Jul 2002 03:25:06 +0000
Subject: [PATCH] r2212: *** empty log message ***

---
 debian/rules | 19 +++++++------------
 debian/watch |  2 +-
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/debian/rules b/debian/rules
index 723f3a8..ab80851 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,11 +10,9 @@ export DH_COMPAT=4
 
 pkg	:= uffi
 debpkg  := cl-uffi
-prefix	:= debian/$(debpkg)
 
 INSTALL	:= install
 INSTALLFLAGS	:= -g root -o root -m 0644
-INSTALLDIRFLAGS	:= -d -g root -o root -m 0755
 
 UPSTREAM_VER	:= $(shell sed -n -e "s/${debpkg} (\(.*\)-[0-9.]).*/\1/p" < debian/changelog |head -1)
 
@@ -23,9 +21,8 @@ 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)
+doc-dir		:= usr/share/doc/${debpkg}
+lispfiles	:= $(clc-uffi)
 
 
 configure: configure-stamp
@@ -42,8 +39,6 @@ build-stamp: configure-stamp
 	dh_testdir
 
 	# Add here commands to compile the package.
-	# Make doc isn't necessary because the docs are in the upstream version
-	# $(MAKE) doc
 
 	touch build-stamp
 
@@ -63,20 +58,20 @@ install: build
 	dh_testroot
 	dh_clean -k
 	dh_installdirs --all $(clc-systems) $(clc-source) 
-	dh_installdirs -p $(debpkg) $(pkg-doc)/html $(clc-uffi)/mcl 
+	dh_installdirs -p $(debpkg) $(doc-dir) $(lispfiles)/mcl 
 
 	# Add here commands to install the package into debian/uffi.
-	$(INSTALL) $(INSTALLFLAGS) $(shell echo src/*.cl *.system) $(lispfiles)
-	$(INSTALL) $(INSTALLFLAGS) $(shell echo src/mcl/*.cl) $(lispfiles)/mcl
+	dh_install "src/*.cl" "*.system" $(lispfiles)
+	dh_install "src/mcl/*.cl" $(lispfiles)/mcl
 
 	rm -rf doc/html
 	(cd doc; tar xzf html.tar.gz; cd ..)
-	$(INSTALL) $(INSTALLFLAGS) doc/html/* $(docfiles)/html
+	dh_install doc/html $(doc-dir)
 	rm -rf doc/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 $(docfiles)
+	dh_install doc/cl-uffi.pdf.gz $(doc-dir)
 	rm -f doc/cl-uffi.pdf.gz
 
 # Build architecture-independent files here.
diff --git a/debian/watch b/debian/watch
index 1a7f6a2..1ca966a 100644
--- a/debian/watch
+++ b/debian/watch
@@ -2,4 +2,4 @@
 # Rename this file to "watch" and then you can run the "uscan" command
 # to check for upstream updates and more.
 # Site		Directory		Pattern			Version	Script
-ftp.med-info.com	/pub/uffi	uffi-(.*)\.tar\.gz	debian	uupdate
+uffi.med-info.com	/	uffi-(.*)\.tar\.gz	debian	uupdate
-- 
2.34.1