--- Makefile.orig	Sun Nov 30 23:44:12 2003
+++ Makefile	Wed May  5 19:31:44 2004
@@ -24,8 +24,8 @@
 exec_prefix = $(prefix)
 # directory where `make install' will put executable.
 bindir = $(exec_prefix)bin/
-libdir = $(exec_prefix)lib/
-infodir = $(prefix)info/
+libdir = $(exec_prefix)lib/slib
+infodir = $(prefix)share/info/
 
 PREVDOCS = prevdocs/
 
@@ -101,9 +101,6 @@
 	echo "(pprint-filter-file \"collect.scm\" macwork:expand \"collectx.scm\")" >> collect.sc
 	echo "(slib:exit #t)" >> collect.sc
 
-collectx.scm: collect.scm macwork.scm collect.sc
-	$(scheme) < collect.sc
-
 ffiles = printf.scm genwrite.scm pp.scm \
 	ppfile.scm strcase.scm debug.scm trace.scm \
 	strport.scm scanf.scm qp.scm break.scm stdio.scm \
@@ -149,8 +146,7 @@
 	coerce.txi byte.txi bytenumb.txi matfile.txi tsort.txi manifest.txi
 % = `echo $(txiscms) | sed 's%.scm%.txi%g'`
 
-docfiles = ANNOUNCE README COPYING FAQ slib.info slib.texi schmooz.texi\
-	 ChangeLog version.txi object.texi $(txifiles)
+docfiles = ANNOUNCE README COPYING FAQ
 mkfiles = Makefile require.scm Template.scm syncase.sh mklibcat.scm \
 	Bev2slib.scm slib.spec slib.sh grapheps.ps
 ifiles = bigloo.init chez.init elk.init macscheme.init mitscheme.init \
@@ -381,3 +377,36 @@
 	-rm -rf *temp
 realempty:	temp/slib
 	-rm -f $(allfiles)
+
+.PHONY: install-sfiles install-bfiles install-docfiles install-mkfiles \
+        install-ifiles install-tfiles install-info install
+
+install-sfiles: $(sfiles)
+	install -d $(libdir)
+	$(INSTALL_DATA) -m 644 $? $(libdir)
+
+install-bfiles: $(bfiles)
+	install -d $(libdir)
+	$(INSTALL_DATA) -m 644 $? $(libdir)
+
+install-docfiles: $(docfiles)
+	install -d $(libdir)
+	$(INSTALL_DATA) -m 644 $? $(libdir)
+
+install-mkfiles: $(mkfiles)
+	install -d $(libdir)
+	$(INSTALL_DATA) -m 644 $? $(libdir)
+
+install-ifiles: $(ifiles)
+	install -d $(libdir)
+	$(INSTALL_DATA) -m 644 $? $(libdir)
+
+install-tfiles: $(tfiles)
+	install -d $(libdir) $(libdir)
+	$(INSTALL_DATA) -m 644 $? $(libdir)
+
+install-info: slib.info
+	gzip -c $? > $(infodir)/$?.gz
+
+install-dp: install-sfiles install-bfiles install-docfiles install-mkfiles \
+	install-ifiles install-tfiles install-info