*** /home/amundson/transfer/clocc/src/defsystem-3.x/defsystem.lisp	2003-09-27 05:00:35.000000000 -0500
--- defsystem.lisp	2003-11-07 05:44:35.000000000 -0600
***************
*** 871,879 ****
        :cormanlisp
        :scl
        (and allegro-version>= (version>= 4 1)))
! (eval-when #-(or :lucid)
             (:compile-toplevel :load-toplevel :execute)
! 	   #+(or :lucid)
             (compile load eval)
  
    (unless (or (fboundp 'lisp::require)
--- 871,879 ----
        :cormanlisp
        :scl
        (and allegro-version>= (version>= 4 1)))
! (eval-when #-(or :lucid :gcl)
             (:compile-toplevel :load-toplevel :execute)
! 	   #+(or :lucid :gcl)
             (compile load eval)
  
    (unless (or (fboundp 'lisp::require)
***************
*** 993,998 ****
--- 993,1002 ----
  #+(or clisp cormanlisp ecl (and gcl defpackage) sbcl)
  (defpackage "MAKE" (:use "COMMON-LISP") (:nicknames "MK"))
  
+ #+gcl
+ (defpackage "MAKE" (:use "LISP" "SYSTEM") (:nicknames "MK")
+              (:import-from conditions ignore-errors))
+ 
  #-(or :sbcl :cltl2 :lispworks :ecl :scl)
  (in-package "MAKE" :nicknames '("MK"))
  
***************
*** 1428,1434 ****
  ;;; ********************************
  ;;; Component Operation Definition *
  ;;; ********************************
! (eval-when (:compile-toplevel :load-toplevel :execute)
  (defvar *version-dir* nil
    "The version subdir. bound in operate-on-system.")
  (defvar *version-replace* nil
--- 1432,1441 ----
  ;;; ********************************
  ;;; Component Operation Definition *
  ;;; ********************************
! (eval-when #-(or :lucid :gcl)
! 	   (:compile-toplevel :load-toplevel :execute)
! 	   #+(or :lucid :gcl)
! 	   (compile load eval)
  (defvar *version-dir* nil
    "The version subdir. bound in operate-on-system.")
  (defvar *version-replace* nil
***************
*** 3358,3366 ****
    (declare #-(or :cltl2 :ansi-cl) (ignore override-compilation-unit))
    (unwind-protect
        ;; Protect the undribble.
!       (#+(or :cltl2 :ansi-cl) with-compilation-unit
! 	 #+(or :cltl2 :ansi-cl) (:override override-compilation-unit)
! 	 #-(or :cltl2 :ansi-cl) progn
  	(when *reset-full-pathname-table* (clear-full-pathname-tables))
  	(when dribble (dribble dribble))
  	(when test (setq verbose t))
--- 3365,3374 ----
    (declare #-(or :cltl2 :ansi-cl) (ignore override-compilation-unit))
    (unwind-protect
        ;; Protect the undribble.
!       (#+(and (or :cltl2 :ansi-cl) (not :gcl)) with-compilation-unit
! 	 #+(and (or :cltl2 :ansi-cl) (not :gcl)) 
! 	 (:override override-compilation-unit)
! 	 #-(and (or :cltl2 :ansi-cl) (not :gcl)) progn
  	(when *reset-full-pathname-table* (clear-full-pathname-tables))
  	(when dribble (dribble dribble))
  	(when test (setq verbose t))
***************
*** 3786,3793 ****
  ;;; if anybody does a funcall on #'require.
  
  ;;; Redefine old require to call the new require.
! (eval-when #-(or :lucid) (:load-toplevel :execute)
! 	   #+(or :lucid) (load eval)
  (unless *old-require*
    (setf *old-require*
  	(symbol-function
--- 3794,3801 ----
  ;;; if anybody does a funcall on #'require.
  
  ;;; Redefine old require to call the new require.
! (eval-when #-(or :lucid :gcl) (:load-toplevel :execute)
! 	   #+(or :lucid  :gcl) (load eval)
  (unless *old-require*
    (setf *old-require*
  	(symbol-function
***************
*** 4207,4212 ****
--- 4215,4221 ----
  	 ;; Ugly, but seems to fix the problem.
  	 (concatenate 'string "./" namestring))))
  
+ #+:gcl(defun ensure-directories-exist (arg0 &key verbose) ())
  (defun compile-file-operation (component force)
    ;; Returns T if the file had to be compiled.
    (let ((must-compile
***************
*** 4243,4248 ****
--- 4252,4258 ----
  			  source-pname
  			  :output-file
  			  output-file
+ 			  #+gcl :system-p #+gcl t
  			  #+(or :cmu :scl) :error-file
  			  #+(or :cmu :scl) (and *cmu-errors-to-file*
  						(component-full-pathname component