From 3c91aed8abc1aaba40d7f074560894cd95473aa0 Mon Sep 17 00:00:00 2001 From: "Michael R. Blair" Date: Wed, 1 Sep 1993 05:32:30 +0000 Subject: [PATCH] Add pc-sample to the options list, and make load-option do a temporary cd to the directory where the option file comes from, so that subsequent loads, for multiple-file options, work correctly. -- GJR --- v7/src/runtime/option.scm | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/v7/src/runtime/option.scm b/v7/src/runtime/option.scm index b390e1d26..dbc1d73c0 100644 --- a/v7/src/runtime/option.scm +++ b/v7/src/runtime/option.scm @@ -1,6 +1,6 @@ #| -*-Scheme-*- -$Id: option.scm,v 14.22 1993/09/01 03:22:19 ziggy Exp $ +$Id: option.scm,v 14.23 1993/09/01 05:32:30 ziggy Exp $ Copyright (c) 1988-1993 Massachusetts Institute of Technology @@ -48,10 +48,14 @@ MIT in each case. |# (let ((environment (package/environment (find-package (car descriptor))))) (for-each (lambda (filename) - (load (merge-pathnames filename directory) - environment - syntax-table/system-internal - true)) + (let ((path (merge-pathnames filename directory))) + (with-working-directory-pathname + (directory-pathname path) + (lambda () + (load path + environment + syntax-table/system-internal + true))))) (cddr descriptor)) (eval (cadr descriptor) environment))) (cdr entry)) @@ -76,15 +80,7 @@ MIT in each case. |# (HASH-TABLE ((RUNTIME HASH-TABLE) (INITIALIZE-PACKAGE!) "hashtb")) (KRYPT ((RUNTIME KRYPT) #F "krypt")) (SUBPROCESS ((RUNTIME SUBPROCESS) (INITIALIZE-PACKAGE!) "process")) - (PC-SAMPLE ((PC-SAMPLE INTERRUPT-HANDLER) (INITIALIZE-PACKAGE!) "pcsboot" - "pcsintrp") - ((PC-SAMPLE) (INITIALIZE-PACKAGE!) "pcsample" - "binutl") - ((PC-SAMPLE INTERP-PROCS) (INITIALIZE-PACKAGE!) "pcsiproc") - ((PC-SAMPLE CODE-BLOCKS) (INITIALIZE-PACKAGE!) "pcscobl") - ((PC-SAMPLE DISPLAY) (INITIALIZE-PACKAGE!) "pcsdisp") - ) - )) + (PC-SAMPLE (() #F "../pcsample/make")))) (define loaded-options '()) -- 2.25.1