From cd47ff6c120fdc6691be498582f54f124fa66afa Mon Sep 17 00:00:00 2001
From: shivers <shivers>
Date: Wed, 15 Sep 1999 14:54:49 +0000
Subject: [PATCH] Random updates.

---
 Makefile.in              | 10 +++++++---
 scsh/scsh-interfaces.scm |  4 +++-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 980049b..ddd7e05 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -657,7 +657,10 @@ loads = $(srcdir)/scsh/let-opt.scm $(srcdir)/scsh/scsh-interfaces.scm \
 	 $(srcdir)/scsh/rx/packages.scm \
 	 $(srcdir)/scsh/rx/cond-package.scm \
 	 $(srcdir)/scsh/scsh-package.scm \
-	 $(srcdir)/scsh/stringpack.scm
+	 $(srcdir)/scsh/lib/string-pack.scm \
+	 $(srcdir)/scsh/lib/list-pack.scm \
+	 $(srcdir)/scsh/lib/ccp-pack.scm
+
 
 scsh/scsh.image: $(VM) $(SCHEME) $(CIG).image
 	(echo ",translate =scheme48/ $(srcdir)/"; \
@@ -670,6 +673,8 @@ scsh/scsh.image: $(VM) $(SCHEME) $(CIG).image
 	 echo ",load-package scsh"; \
 	 echo ",load-package scsh-here-string-hax"; \
 	 echo ",translate =scheme48/ $(LIB)/"; \
+	 echo ",load-package list-lib"; \
+	 echo ",load-package string-lib"; \
 	 echo ",load-package ccp-lib"; \
 	 echo ",in scsh-level-0"; \
 	 echo "(%install-scsh-handlers)"; \
@@ -677,8 +682,7 @@ scsh/scsh.image: $(VM) $(SCHEME) $(CIG).image
 	 echo ",user"; \
 	 echo ",open floatnums"; \
 	 echo ",open scsh"; \
-	 echo ",open string-lib"; \
-	 echo ",open ccp-lib"; \
+	 echo ",open list-lib string-lib ccp-lib"; \
 	 echo "(dump-scsh \"scsh/scsh.image\")") \
 	| ./$(VM) -o ./$(VM) -h 10000000 -i $(CIG).image
 
diff --git a/scsh/scsh-interfaces.scm b/scsh/scsh-interfaces.scm
index 788453b..f12d3e8 100644
--- a/scsh/scsh-interfaces.scm
+++ b/scsh/scsh-interfaces.scm
@@ -436,7 +436,9 @@
 
 
 (define-interface scsh-string-interface
-  (export substitute-env-vars string-index string-index-right))
+  (export substitute-env-vars
+	  ;string-index string-index-right ; Now in string-lib
+	  ))
 
 (define-interface scsh-file-names-interface
   (export file-name-as-directory