1 files changed, 61 insertions, 37 deletions

diff --git a/debian/rules b/debian/rules
index 77e2a92..c3b6b26 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,5 @@
 #! /usr/bin/make -f
-#
+# -*-Makefile-*-
 
 CC =gcc
 CFLAGS =-O2 -g -Wall
@@ -14,86 +14,110 @@ INSTALL_PROGRAM =$(INSTALL) -m 755 -o root -g root
 INSTALL_DATA =$(INSTALL) -m 644 -o root -g root
 INSTALL_MAN =$(INSTALL) -m 444 -o root -g root
 
-config:
-	$(checkdir)
-	./configure
-	touch stamp-config
+SCM_OPTIONS = -p linux --compiler-options=-O2 --compiler-options=-g \
+  -F cautious \
+  -F bignums \
+  -F arrays \
+  -F array-for-each \
+  -F inexact \
+  -F record \
+	-F compiled-closure \
+  -F generalized-c-arguments \
+  -F tick-interrupts \
+  -F i/o-extensions \
+#  -F turtlegr \
+  -F curses \
+  -F edit-line \
+  -F regex \
+  -F socket \
+	-F posix \
+  -F unix \
+  -F dynamic-linking \
+  -F dump \
+  -F heap-can-shrink \
+	-F macro
+
+NON_LIB_FILES = 'bench.scm|build.scm|example.scm|r4rstest.scm|pi.scm'
+
+#test: stamp-configure
+#	$(checkdir)
+#	make checklit
 
 build:
 	$(checkdir)
-	test -f stamp-config || make -f debian/rules config
-	make
+	${MAKE} scmlit
+	test -e /usr/lib/slib || \
+    (echo "Must have slib installed for compile" && exit 1)	
+	cp debian/require.scm.debian require.scm
+	SCHEME_LIBRARY_PATH=/usr/lib/slib/ ./build.scm ${SCM_OPTIONS} > debian/bld
+	chmod ug+x debian/bld
+	debian/bld
+	-rm -f debian/bld
 	makeinfo scm.texi -o scm.info
 	texi2html -monolithic scm.texi
-	cp debian/require.scm.debian require.scm
-	touch stamp-build
+	touch build
 
 clean:
 	$(checkdir)
-	test -f stamp-config || make -f debian/rules config
-	-rm scm.info* scm.html require.scm scm
+	-rm scm.info* scm.html tmp1 tmp2 scmflags.h scmlit
+	-rm require.scm scm
 	make distclean
-	-rm Makefile
-	-rm -f stamp-config stamp-build
-	-rm -rf debian/tmp* debian/files debian/substvars
+	-rm -f build debian/bld
+	-rm -rf *~ debian/*~ debian/tmp* debian/files debian/substvars
 
 binary-indep: checkroot
 	$(checkdir)
 
-binary-arch: checkroot
-	$(checkdir)
+binary-arch: checkroot build
+	$(checkdir)	
 	-rm -rf debian/tmp*
-	test -f stamp-build || make -f debian/rules build
-#
-#
+
 # debian/tmp
 	$(INSTALL_DIR) debian/tmp
 	$(INSTALL_DIR) debian/tmp/DEBIAN
 	$(INSTALL_PROGRAM) debian/postinst debian/tmp/DEBIAN
 	$(INSTALL_PROGRAM) debian/postrm debian/tmp/DEBIAN
+
 # binaries
 	$(INSTALL_DIR) debian/tmp/usr/bin
 	$(INSTALL_PROGRAM) -s scm debian/tmp/usr/bin
+
 # library
 	$(INSTALL_DIR) debian/tmp/usr/lib/scm
-	$(INSTALL_DATA) COPYING debian/tmp/usr/lib/scm
-	$(INSTALL_DATA) Init.scm debian/tmp/usr/lib/scm
-	$(INSTALL_DATA) Transcen.scm debian/tmp/usr/lib/scm
-	$(INSTALL_DATA) Iedline.scm debian/tmp/usr/lib/scm
-	$(INSTALL_DATA) Link.scm debian/tmp/usr/lib/scm
-	$(INSTALL_DATA) require.scm 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
 
 # man pages
 	$(INSTALL_DIR) debian/tmp/usr/man/man1
 	$(INSTALL_MAN)	scm.1 debian/tmp/usr/man/man1
-	-gzip -9fr debian/tmp/usr/man
+	gzip -9vr debian/tmp/usr/man
+
 # documentation
 	$(INSTALL_DIR) debian/tmp/usr/doc/scm
-	$(INSTALL_DATA) debian/copyright debian/tmp/usr/doc/scm
-	$(INSTALL_DATA) debian/changelog \
-	  debian/tmp/usr/doc/scm/changelog.Debian
-	gzip -9 debian/tmp/usr/doc/scm/changelog.Debian
-#
+	$(INSTALL_DATA) debian/changelog debian/tmp/usr/doc/scm/changelog.Debian
 	$(INSTALL_DATA) ChangeLog debian/tmp/usr/doc/scm
-	gzip -9 debian/tmp/usr/doc/scm/ChangeLog
 	$(INSTALL_DATA) QUICKREF debian/tmp/usr/doc/scm
 	$(INSTALL_DATA) README debian/tmp/usr/doc/scm
-	$(INSTALL_DATA) README.unix debian/tmp/usr/doc/scm
+	gzip -9v debian/tmp/usr/doc/scm/*
 	$(INSTALL_DATA) scm.html debian/tmp/usr/doc/scm
+	$(INSTALL_DATA) debian/copyright debian/tmp/usr/doc/scm
+
 # examples
 	$(INSTALL_DIR) debian/tmp/usr/doc/scm/examples
+	$(INSTALL_DATA) r4rstest.scm debian/tmp/usr/doc/scm/examples
 	$(INSTALL_DATA) example.scm debian/tmp/usr/doc/scm/examples
 	$(INSTALL_DATA) pi.scm debian/tmp/usr/doc/scm/examples
 	$(INSTALL_DATA) pi.c debian/tmp/usr/doc/scm/examples
+	$(INSTALL_DATA) bench.scm debian/tmp/usr/doc/scm/examples
 	$(INSTALL_DATA) split.scm debian/tmp/usr/doc/scm/examples
-	$(INSTALL_DATA) r4rstest.scm debian/tmp/usr/doc/scm/examples
+
 # info pages
 	$(INSTALL_DIR) debian/tmp/usr/info
 	$(INSTALL_DATA) scm.info* debian/tmp/usr/info
 	gzip -9 debian/tmp/usr/info/*
-#
+
 	dpkg-shlibdeps scm
-	dpkg-gencontrol  -isp -pscm -Pdebian/tmp
+	dpkg-gencontrol
 	dpkg --build debian/tmp ..
 
 define checkdir
@@ -106,4 +130,4 @@ checkroot:
 	$(checkdir)
 	test root = "`whoami`"
 
-.PHONY: config build clean binary binary-arch binary-indep
+.PHONY: clean binary binary-arch binary-indep