1 files changed, 92 insertions, 63 deletions

diff --git a/debian/rules b/debian/rules
index 5049713..b3ce1d5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -52,14 +52,14 @@ SCM_OPTIONS = -p linux  \
 #export SCHEME_LIBRARY_PATH
 NON_LIB_FILES = 'bench.scm|build.scm|example.scm|r4rstest.scm|pi.scm|grtest.scm'
 
-#test: stamp-configure
-#	$(checkdir)
-#	make checklit
+# Uncomment this to turn on verbose mode
+#export DH_VERBOSE=1
+
 
 build: build-stamp
 build-stamp:
 	chmod +x build
-	$(checkdir)
+	dh_testdir
 	cp debian/require.scm.debian require.scm
 ifeq ($(DEB_BUILD_ARCH), m68k)
 	${MAKE} scmlit CFLAGS="-g -Wall"
@@ -78,7 +78,10 @@ endif
 	touch build-stamp
 
 clean:
-	$(checkdir)
+	dh_testdir
+	dh_testroot
+	-rm -f build-stamp
+
 	-rm -f scm.info* scm.html tmp1 tmp2 scmflags.h scmlit
 	-rm -f Xlibscm.info*
 	-rm -f features.txi platform.txi
@@ -88,81 +91,107 @@ clean:
 	-rm -f srcdir.mk
 	-rm -f debian/bld
 	-rm -rf *~ debian/*~ debian/tmp* debian/files debian/substvars
-	-rm -f build-stamp
 
-binary-indep: checkroot
-	$(checkdir)
+	dh_clean
+
+binary-indep: build install
+# We have nothing to do by default
 
-binary-arch: checkroot build
-	$(checkdir)
-	-rm -rf debian/tmp*
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
 
-# debian/tmp
-	$(INSTALL_DIR) debian/tmp
-	$(INSTALL_DIR) debian/tmp/DEBIAN
-	$(INSTALL_PROGRAM) debian/postinst debian/tmp/DEBIAN
-	$(INSTALL_PROGRAM) debian/prerm debian/tmp/DEBIAN
+	-rm -rf debian/scm
+
+# debian/scm
+	$(INSTALL_DIR) debian/scm
+	$(INSTALL_DIR) debian/scm/DEBIAN
+	$(INSTALL_PROGRAM) debian/postinst debian/scm/DEBIAN
+	$(INSTALL_PROGRAM) debian/prerm debian/scm/DEBIAN
 
 # binaries
-	$(INSTALL_DIR) debian/tmp/usr/bin
-	$(INSTALL_PROGRAM) -s scm debian/tmp/usr/bin
+	$(INSTALL_DIR) debian/scm/usr/bin
+	$(INSTALL_PROGRAM) -s scm debian/scm/usr/bin
 
 # library
-	$(INSTALL_DIR) debian/tmp/usr/lib/scm
-	$(INSTALL_DATA) `ls *.scm | egrep -v ${NON_LIB_FILES}` debian/tmp/usr/lib/scm
-	$(INSTALL_DATA) slibcat debian/tmp/usr/lib/scm
+	$(INSTALL_DIR) debian/scm/usr/lib/scm
+	$(INSTALL_DATA) `ls *.scm | egrep -v ${NON_LIB_FILES}` debian/scm/usr/lib/scm
+	$(INSTALL_DATA) slibcat debian/scm/usr/lib/scm
+	chmod +x debian/scm/usr/lib/scm/compile.scm
+	chmod +x debian/scm/usr/lib/scm/xgen.scm
 
 # headers
-	$(INSTALL_DIR) debian/tmp/usr/include/scm
-	$(INSTALL_DATA) *.h debian/tmp/usr/include/scm
+	$(INSTALL_DIR) debian/scm/usr/include/scm
+	$(INSTALL_DATA) *.h debian/scm/usr/include/scm
 
 # man pages
-	$(INSTALL_DIR) debian/tmp/usr/share/man/man1
-	$(INSTALL_MAN)	scm.1 debian/tmp/usr/share/man/man1
-	gzip -9vr debian/tmp/usr/share/man || true
+	$(INSTALL_DIR) debian/scm/usr/share/man/man1
+	$(INSTALL_MAN)	scm.1 debian/scm/usr/share/man/man1
+	gzip -9vr debian/scm/usr/share/man || true
 
 # documentation
-	$(INSTALL_DIR) debian/tmp/usr/share/doc/scm
-	$(INSTALL_DATA) debian/changelog debian/tmp/usr/share/doc/scm/changelog.Debian
-	$(INSTALL_DATA) ChangeLog debian/tmp/usr/share/doc/scm/changelog
-	$(INSTALL_DATA) QUICKREF debian/tmp/usr/share/doc/scm
-	$(INSTALL_DATA) README debian/tmp/usr/share/doc/scm
-	gzip -9v debian/tmp/usr/share/doc/scm/*
-	$(INSTALL_DATA) scm.html debian/tmp/usr/share/doc/scm
-	$(INSTALL_DATA) Xlibscm.html debian/tmp/usr/share/doc/scm
-	$(INSTALL_DATA) debian/copyright debian/tmp/usr/share/doc/scm
-
-	$(INSTALL_DIR) debian/tmp/usr/share/doc-base
-	$(INSTALL_DATA) debian/doc-base debian/tmp/usr/share/doc-base/scm
+	$(INSTALL_DIR) debian/scm/usr/share/doc/scm
+	$(INSTALL_DATA) debian/changelog debian/scm/usr/share/doc/scm/changelog.Debian
+	$(INSTALL_DATA) ChangeLog debian/scm/usr/share/doc/scm/changelog
+	$(INSTALL_DATA) QUICKREF debian/scm/usr/share/doc/scm
+	$(INSTALL_DATA) README debian/scm/usr/share/doc/scm
+	gzip -9v debian/scm/usr/share/doc/scm/*
+	$(INSTALL_DATA) scm.html debian/scm/usr/share/doc/scm
+	$(INSTALL_DATA) Xlibscm.html debian/scm/usr/share/doc/scm
+	$(INSTALL_DATA) debian/copyright debian/scm/usr/share/doc/scm
+
+	$(INSTALL_DIR) debian/scm/usr/share/doc-base
+	$(INSTALL_DATA) debian/doc-base debian/scm/usr/share/doc-base/scm
 
 # examples
-	$(INSTALL_DIR) debian/tmp/usr/share/doc/scm/examples
-	$(INSTALL_DATA) r4rstest.scm debian/tmp/usr/share/doc/scm/examples
-	$(INSTALL_DATA) example.scm debian/tmp/usr/share/doc/scm/examples
-	$(INSTALL_DATA) pi.scm debian/tmp/usr/share/doc/scm/examples
-	$(INSTALL_DATA) pi.c debian/tmp/usr/share/doc/scm/examples
-	$(INSTALL_DATA) bench.scm debian/tmp/usr/share/doc/scm/examples
-	$(INSTALL_DATA) split.scm debian/tmp/usr/share/doc/scm/examples
-#	$(INSTALL_DATA) grtest.scm debian/tmp/usr/share/doc/scm/examples
+	$(INSTALL_DIR) debian/scm/usr/share/doc/scm/examples
+	$(INSTALL_DATA) r4rstest.scm debian/scm/usr/share/doc/scm/examples
+	$(INSTALL_DATA) example.scm debian/scm/usr/share/doc/scm/examples
+	$(INSTALL_DATA) pi.scm debian/scm/usr/share/doc/scm/examples
+	$(INSTALL_DATA) pi.c debian/scm/usr/share/doc/scm/examples
+	$(INSTALL_DATA) bench.scm debian/scm/usr/share/doc/scm/examples
+	$(INSTALL_DATA) split.scm debian/scm/usr/share/doc/scm/examples
+#	$(INSTALL_DATA) grtest.scm debian/scm/usr/share/doc/scm/examples
 
 # info pages
-	$(INSTALL_DIR) debian/tmp/usr/share/info
-	$(INSTALL_DATA) scm.info* debian/tmp/usr/share/info
-	$(INSTALL_DATA) Xlibscm.info* debian/tmp/usr/share/info
-	gzip -9 debian/tmp/usr/share/info/*
-
-	dpkg-shlibdeps scm
-	dpkg-gencontrol -isp
-	dpkg --build debian/tmp ..
-
-define checkdir
-	test -f scm.h -a -f debian/rules
-endef
+	$(INSTALL_DIR) debian/scm/usr/share/info
+	$(INSTALL_DATA) scm.info* debian/scm/usr/share/info
+	$(INSTALL_DATA) Xlibscm.info* debian/scm/usr/share/info
+	gzip -9 debian/scm/usr/share/info/*
+
+binary-arch: build
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs
+	dh_installdocs
+	dh_installexamples
+#	dh_install
+#	dh_installmenu
+#	dh_installdebconf
+#	dh_installlogrotate
+#	dh_installemacsen
+#	dh_installcatalogs
+#	dh_installpam
+#	dh_installmime
+#	dh_installcron
+#	dh_installinfo
+#	dh_uncodumented
+	dh_installman
+	dh_link
+	dh_strip
+	dh_compress
+	dh_fixperms
+#	dh_perl
+#	dh_python
+#	dh_makeshlibs
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
 
 binary: binary-indep binary-arch
 
-checkroot:
-	$(checkdir)
-	test root = "`whoami`"
-
-.PHONY: build clean binary binary-arch binary-indep
+.PHONY: build clean binary binary-arch binary-indep install