From 5b852cc4bdb426f577ea575760253ff77a154730 Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Wed, 11 Jun 2014 08:06:40 +0100 Subject: [PATCH] setup/dirs: adjust `get-lib-search-dirs` and use if `find-dll-dir` Add `find-dll-dir` to the end, not the beginning, so that it doesn't override the user's directory. Improve checking for whether the DLL directory is already covered by the library directories. --- racket/collects/setup/dirs.rkt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/racket/collects/setup/dirs.rkt b/racket/collects/setup/dirs.rkt index 7966062bd2..77103764a1 100644 --- a/racket/collects/setup/dirs.rkt +++ b/racket/collects/setup/dirs.rkt @@ -117,7 +117,10 @@ ;; Helpers (define (single p) (if p (list p) null)) -(define (extra a l) (if (and a (not (member a l))) (cons a l) l)) +(define (extra a l) (if (and a (not (member (path->directory-path a) + (map path->directory-path l)))) + (append l (list a)) + l)) (define (combine-search l default) ;; Replace #f in list with default path: (if l