From 71a43f34c8341eac46647ebb7862c0a64d61380d Mon Sep 17 00:00:00 2001
From: Sam Tobin-Hochstadt <samth@cs.indiana.edu>
Date: Fri, 3 Feb 2017 15:19:28 +0000
Subject: [PATCH] Use correct base path for finding gracket. (#1609)

Fixes error in http://drdr.racket-lang.org/38697/pkgs/compiler-test/tests/compiler/embed/test.rkt#output1
---
 racket/collects/launcher/launcher.rkt | 64 +++++++++++++--------------
 1 file changed, 31 insertions(+), 33 deletions(-)

diff --git a/racket/collects/launcher/launcher.rkt b/racket/collects/launcher/launcher.rkt
index f1c3f58ab0..c85a15a59d 100644
--- a/racket/collects/launcher/launcher.rkt
+++ b/racket/collects/launcher/launcher.rkt
@@ -399,37 +399,37 @@
                    (and im (eq? (cdr im) 'addon-tethered)))]
          [config? (let ([im (assoc 'install-mode aux)])
                     (and im (eq? (cdr im) 'config-tethered)))]
+         [bindir (if alt-exe
+                     (let ([m (assq 'exe-is-gracket aux)])
+                       (if (and m (cdr m))
+                           (find-lib-dir)
+                           (let ([p (path-only dest)])
+                             (if (eq? 'macosx (cross-system-type))
+                                 (let* ([cdir (or (and addon?
+                                                       (find-addon-tethered-console-bin-dir))
+                                                  (and config?
+                                                       (find-config-tethered-console-bin-dir))
+                                                  (find-console-bin-dir))]
+                                        [gdir (or (and addon?
+                                                       (find-addon-tethered-gui-bin-dir))
+                                                  (and config?
+                                                       (find-config-tethered-gui-bin-dir))
+                                                  (find-gui-bin-dir))]
+                                        [rel (find-relative-path cdir gdir)])
+                                   (cond
+                                     [(relative-path? rel)
+                                      (build-path p rel)]
+                                     [(equal? cdir gdir) p]
+                                     [else rel]))
+                                 p))))
+                     (if (eq? kind 'mred)
+                         (find-gui-bin-dir)
+                         (find-console-bin-dir)))]
          [dir-finder
-          (let ([bindir (if alt-exe
-                            (let ([m (assq 'exe-is-gracket aux)])
-                              (if (and m (cdr m))
-                                  (find-lib-dir)
-                                  (let ([p (path-only dest)])
-                                    (if (eq? 'macosx (cross-system-type))
-                                        (let* ([cdir (or (and addon?
-                                                              (find-addon-tethered-console-bin-dir))
-                                                         (and config?
-                                                              (find-config-tethered-console-bin-dir))
-                                                         (find-console-bin-dir))]
-                                               [gdir (or (and addon?
-                                                              (find-addon-tethered-gui-bin-dir))
-                                                         (and config?
-                                                              (find-config-tethered-gui-bin-dir))
-                                                         (find-gui-bin-dir))]
-                                               [rel (find-relative-path cdir gdir)])
-                                          (cond
-                                           [(relative-path? rel)
-                                            (build-path p rel)]
-                                           [(equal? cdir gdir) p]
-                                           [else rel]))
-                                        p))))
-			    (if (eq? kind 'mred)
-				(find-gui-bin-dir)
-				(find-console-bin-dir)))])
-            (if (let ([a (assq 'relative? aux)])
-                  (and a (cdr a)))
-                (make-relative-path-header dest bindir use-librktdir?)
-                (make-absolute-path-header bindir)))]
+          (if (let ([a (assq 'relative? aux)])
+                (and a (cdr a)))
+              (make-relative-path-header dest bindir use-librktdir?)
+              (make-absolute-path-header bindir))]
          [exec (format
                 "exec \"${~a}/~a~a\" ~a"
                 (if use-librktdir?
@@ -470,9 +470,7 @@
         (when use-librktdir?
           (display "# {{{ librktdir\n")
           (display "librktdir=\"$bindir/")
-          (display (find-relative-path (simplify-path
-                                        (let-values ([(base name dir?) (split-path (path->complete-path dest))])
-                                          base))
+          (display (find-relative-path bindir
                                        (simplify-path
                                         (find-lib-dir))))
           (display "\"\n")