X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=debian%2Frules;h=92347b96b3e49efa69bd06344c1bb8442dad109a;hb=f5e6a5198989a460c4787041830d66fa76ebcdab;hp=a96513c130bf4a17643be4d7b5702ac1a03d1731;hpb=bdb966b22ea563a7dfa1f464a1b6cb6d8b5a712c;p=uffi.git

diff --git a/debian/rules b/debian/rules
index a96513c..92347b9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,7 +11,7 @@ clc-systems	:= usr/share/common-lisp/systems
 clc-files	:= $(clc-source)/$(pkg)
 clc-tests	:= $(clc-source)/$(pkg-tests)
 doc-dir		:= usr/share/doc/$(debpkg)
-lib-dir		:= usr/lib
+lib-dir		:= usr/lib/uffi
 
 configure: configure-stamp
 configure-stamp:
@@ -25,7 +25,7 @@ build: build-stamp
 build-stamp: configure-stamp 
 	dh_testdir
 	# Add here commands to compile the package.
-	(cd tests; make linux)
+	(cd tests; make)
 	touch build-stamp
 
 clean:
@@ -33,9 +33,10 @@ clean:
 	dh_testroot
 	rm -f build-stamp configure-stamp
 	# Add here commands to clean up after the build process.
-	-$(MAKE) clean
+	$(MAKE) clean
 	(cd tests; make clean)
 	rm -f debian/$(debpkg).postinst.* debian/$(debpkg).prerm.*
+	rm -f doc/cl-uffi.pdf.gz
 	dh_clean
 
 install: build
@@ -55,38 +56,30 @@ install: build
 	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 # ensure file not present before making gz
 	gzip -9 doc/cl-uffi.pdf
 	dh_install doc/cl-uffi.pdf.gz $(doc-dir)
 
 	dh_installdirs -p $(debpkg-tests) $(clc-tests)/tests $(lib-dir)
 	dh_install -p $(debpkg-tests) $(pkg-tests).asd $(clc-tests)
-	dh_install -p $(debpkg-tests) "tests/*.lisp" $(clc-tests)/tests
-	dh_install -p $(debpkg-tests) "tests/uffi-c-test-lib.so" $(lib-dir)
+	dh_install -p $(debpkg-tests) tests/*.lisp tests/*.c $(clc-tests)/tests
+	dh_install -p $(debpkg-tests) tests/*.so $(lib-dir)
 	dh_link -p $(debpkg-tests) $(clc-tests)/$(pkg-tests).asd $(clc-systems)/$(pkg-tests).asd
 
 # Build architecture-independent files here.
 binary-indep: build install
 	dh_testdir -i
 	dh_testroot -i
-#	dh_installdebconf -i
 	dh_installdocs -i
 	dh_installexamples -i examples/*.lisp
 	dh_installmenu -i
-#	dh_installlogrotate -i
-#	dh_installemacsen -i
-#	dh_installpam -i
-#	dh_installmime -i
-#	dh_installinit -i
 	dh_installcron -i
-#	dh_installman -i
 	dh_installinfo -i
-#	dh_undocumented -i
 	dh_installchangelogs ChangeLog -i
 	dh_link -i
 	dh_compress -i
 	dh_fixperms -i
 	dh_installdeb -i
-#	dh_perl -i
 	dh_gencontrol -i
 	dh_md5sums -i
 	dh_builddeb -i
@@ -95,19 +88,7 @@ binary-indep: build install
 binary-arch: build install
 	dh_testdir -a
 	dh_testroot -a
-#	dh_installdebconf -a
 	dh_installdocs -a
-#	dh_installlogrotate -a
-#	dh_installemacsen -a
-#	dh_installpam -a
-#	dh_installmime -a
-#	dh_installinit -a
-#	dh_installcron -a
-#	dh_installman -a
-#	dh_installinfo -a
-#	dh_undocumented -a
-#	dh_makeshlibs -a
-#	dh_perl -a
 	dh_installchangelogs ChangeLog -a
 	dh_strip -a
 	dh_link -a
@@ -115,8 +96,8 @@ binary-arch: build install
 	dh_fixperms -a
 	dh_installmenu -a
 	dh_installdeb -a
-	dh_gencontrol -a
 	dh_shlibdeps -a
+	dh_gencontrol -a
 	dh_md5sums -a
 	dh_builddeb -a