Skip to content

Commit 7b15453

Browse files
authored
Merge pull request #495 from Affonso-Gui/program-name-no-dirs
Don't decide which packages to load based on full program path in eusstart
2 parents b066991 + 3bea5d3 commit 7b15453

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

lisp/l/eusstart.l

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,7 @@
349349
gc alloc runtime))
350350
(setf (symbol-function 'exit) (symbol-function 'unix::exit))
351351
;;
352-
;(when (substringp "P" (string-upcase *program-name*))
352+
;(when (substringp "P" (string-upcase (pathname-name *program-name*)))
353353
(in-package "SYSTEM")
354354
(system::exec-module-init "par" "l/par.l")
355355
;;
@@ -368,9 +368,10 @@
368368
;; load geometric package
369369
;;
370370

371-
(when (or (substringp "G" (string-upcase *program-name*))
372-
(substringp "X" (string-upcase *program-name*))
373-
(substringp "COMP" (string-upcase *program-name*)))
371+
(when (let ((*program-name* (string-upcase (pathname-name *program-name*))))
372+
(or (substringp "G" *program-name*)
373+
(substringp "X" *program-name*)
374+
(substringp "COMP" *program-name*)))
374375
;; (format t "Loading geometry modules.~%")
375376
(sys:alloc 80000)
376377
(sys:alloc 50000)

0 commit comments

Comments
 (0)