diff --git a/scheme/cyclone/array-list.scm b/scheme/cyclone/array-list.scm index c2429e37..554861f0 100644 --- a/scheme/cyclone/array-list.scm +++ b/scheme/cyclone/array-list.scm @@ -1,4 +1,4 @@ -#| +| | Copyright (c) 2017 Koz Ross | | Permission is hereby granted, free of charge, to any person obtaining a copy of diff --git a/scheme/cyclone/libraries.sld b/scheme/cyclone/libraries.sld index 54a4a4d9..3e8ad67e 100644 --- a/scheme/cyclone/libraries.sld +++ b/scheme/cyclone/libraries.sld @@ -307,7 +307,7 @@ ;(tagged-list? 'srfi import) (tagged-list? 'cyclone import) ) - (list (Cyc-installation-dir 'sld) "./") + (list "./" (Cyc-installation-dir 'sld)) (list "./")))) (call/cc (lambda (return) @@ -321,12 +321,9 @@ (append prepend-dirs dir append-dirs)) ;; Not found, just return base name (lib:check-system-path - (if (> (string-length (car dir)) 0) - (string-append (car dir) "/" filename) - filename)))) - ;(if (tagged-list? 'scheme import) - ; (string-append (Cyc-installation-dir 'sld) "/" path) ;; Built-in library - ; path) + (if (> (length dir) 1) + (string-append (cadr dir) "/" filename) + (string-append (car dir) "/" filename))))) )) ;; string :: string