diff --git a/make-image.lisp.in b/make-image.lisp.in index 78cbb7f..2e4b66e 100644 --- a/make-image.lisp.in +++ b/make-image.lisp.in @@ -1,7 +1,8 @@ #-(or sbcl clisp openmcl ecl) (error "This lisp implementation is not supported.") (require 'asdf) -(asdf:oos 'asdf:load-op 'stumpwm) +#+ecl (asdf:oos 'asdf:load-fasl-op 'stumpwm) +#-ecl (asdf:oos 'asdf:load-op 'stumpwm) #-ecl (stumpwm:set-contrib-dir "@CONTRIB_DIR@") #+sbcl @@ -22,9 +23,8 @@ (ccl:save-application "stumpwm" :prepend-kernel t :toplevel-function #'stumpwm:stumpwm) #+ecl -(asdf:make-build 'stumpwm :type :program :monolithic t +(asdf:make-build 'stumpwm :type :program :move-here "." - :name-suffix "" :epilogue-code '(progn (stumpwm:set-contrib-dir "@CONTRIB_DIR@") (stumpwm:stumpwm))) diff --git a/user.lisp b/user.lisp index eafc31f..ea22415 100644 --- a/user.lisp +++ b/user.lisp @@ -317,11 +317,16 @@ current frame instead of switching to the window." (defcommand reload () () "Reload StumpWM using @code{asdf}." - (message "Reloading StumpWM...") - #+asdf (with-restarts-menu - (asdf:operate 'asdf:load-op :stumpwm)) - #-asdf (message "^B^1*Sorry, StumpWM can only be reloaded with asdf (for now.)") - #+asdf (message "Reloading StumpWM...^B^2*Done^n.")) + #+(and asdf (not ecl)) + (progn + (message "Reloading StumpWM...") + (with-restarts-menu + (asdf:operate 'asdf:load-op :stumpwm)) + (message "Reloading StumpWM...^B^2*Done^n.")) + #-asdf + (message "^B^1*Sorry, StumpWM can only be reloaded with asdf (for now.)") + #+ecl + (message "^B^1*Sorry, StumpWM cannot be reloaded when built as standalone program.")) (defcommand emacs () () "Start emacs unless it is already running, in which case focus it."