* boot-9.scm (%load-path): Add the site directory.

Add the directory named after the version number.
Prepend the version number to the other directories in the path.
Simplify by mapping the common prefix onto each item.
* Makefile.in (datadir, pkgdatadir, pkgverdatadir, subpkgdatadir,
sitedatadir): New definitions.
(libparent, libdir, install_path): Replaced by above.
(install): Create the above directories.
Put the source files into subpkgdatadir.
(uninstall): Remove the above directories.

ice-9/Makefile.in

@@ -25,9 +25,11 @@ prefix = @prefix@
 
 VERSION=@GUILE_VERSION@
 
-libparent=$(prefix)/lib
+datadir=@datadir@
-libdir=$(libparent)/guile$(VERSION)
+pkgdatadir=$(datadir)/guile
-install_path=$(libdir)/@library_name@
+pkgverdatadir=$(pkgdatadir)/$(VERSION)
+subpkgdatadir=$(pkgverdatadir)/@library_name@
+sitedatadir=$(pkgdatadir)/site
 
 INSTALL = $(srcdir)/../install-sh -c
 INSTALL_DATA = $(INSTALL) -m 644
@@ -54,20 +56,23 @@ aux_files = \
 all: 
 
 install: all
-	test -d $(libparent) || mkdir $(libparent)
+	for dir in $(datadir) $(pkgdatadir) $(pkgverdatadir) \
-	test -d $(libdir) || mkdir $(libdir)
+	  $(subpkgdatadir) $(sitedatadir); do \
-	test -d $(install_path) || mkdir $(install_path)
+	  test -d $$dir || mkdir $$dir; \
-	cd $(srcdir); \
+	done
 	for file in $(scm_files); do \
-	  $(INSTALL_DATA) $$file $(install_path); \
+	  $(INSTALL_DATA) $(srcdir)/$$file $(subpkgdatadir); \
 	done
 
 uninstall: 
 	for file in $(scm_files) ; do \
-	  rm -f $(install_path)/$$file;  \
+	  rm -f $(subpkgdatadir)/$$file;  \
 	done;
-	-rmdir $(install_path)
+	-rmdir $(subpkgdatadir)
-	-rmdir $(libdir)
+	-rmdir $(pkgverdatadir)
+	-rmdir $(sitedatadir)
+	-rmdir $(pkgdatadir)
+	-rmdir $(datadir)
 
 
 # The `dist' target in the top-level Makefile uses this `dist-dir'

ice-9/boot-9.scm

@@ -789,11 +789,14 @@
 (define %load-path
   (let ((lp (catch #t (lambda () (getenv "SCHEME_LOAD_PATH"))
 		   (lambda args #f))))
-    (append (parse-path lp)
+    (append
-	    (list ""
+     (parse-path lp)
-		  (in-vicinity (implementation-vicinity) "guile1.0b3/guile/")
+     (cons "./"
-		  (in-vicinity (implementation-vicinity) "guile1.0b3/")
+	   (map (lambda (dir) (in-vicinity (implementation-vicinity) dir "/"))
-		  (in-vicinity (implementation-vicinity) "slib/")))))
+		(cons "site"
+		      (map (lambda (dir) (string-append (version) "/" dir))
+			   '("." "gls/guile" "gls" "slib"))))))))
+
 
 ;;; {try-load}
 ;;;