X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=debian%2Frules;h=0fc5ec7098dfa2d822e638adea86eb471d7a0a1e;hb=43a09c901590a99761fe6a416c7144063e2b75f4;hp=2980bea585ed469abed5ecb84ab4d519fa8c126d;hpb=46402bcabf725d00624ec3bb994f64bdf79720df;p=uffi.git

diff --git a/debian/rules b/debian/rules
index 2980bea..0fc5ec7 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,8 +21,8 @@ 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}
+doc-dir		:= usr/share/doc/${debpkg}
+lispfiles	:= $(clc-uffi)
 
 
 configure: configure-stamp
@@ -41,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
 
@@ -61,19 +57,20 @@ install: build
 	dh_testdir
 	dh_testroot
 	dh_clean -k
-	dh_installdirs
+	dh_installdirs --all $(clc-systems) $(clc-source) 
+	dh_installdirs -p $(debpkg) $(doc-dir) $(lispfiles)/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) $(srcdir)/mcl
-	$(INSTALL) $(INSTALLFLAGS) doc/html/* $(DOCDIR)/html
+	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 ..)
+	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 $(DOCDIR)
-	rm -f doc/cl-uffi.pdf.gz
+	gzip -9 doc/cl-uffi.pdf
+	dh_install doc/cl-uffi.pdf.gz $(doc-dir)
 
 # Build architecture-independent files here.
 binary-indep: build install
@@ -100,7 +97,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