Changeset 14668

Timestamp:

04/17/14 10:35:17 (9 years ago)

Author:

Mark Evenson

Message:

Backport r14657: Find contrib based on system jar name.

From Olof-Joachim Frahm.

File:

• branches/1.3.1/src/org/armedbear/lisp/abcl-contrib.lisp (modified) (1 diff)

branches/1.3.1/src/org/armedbear/lisp/abcl-contrib.lisp

@@ -98 +98 @@
   (or (ignore-errors
         (find-contrib-jar))
+      (ignore-errors
+        (let ((system-jar (find-system-jar)))
+          (when system-jar
+            (probe-file (make-pathname
+                         :defaults system-jar
+                         :name (concatenate 'string
+                                            "abcl-contrib"
+                                            (subseq (pathname-name system-jar) 4)))))))
       (some
        (lambda (u)