From 36f0720c5ae666fb16c23e3c83cf5644e08e776c Mon Sep 17 00:00:00 2001
From: Matthew Flatt <mflatt@racket-lang.org>
Date: Sun, 14 May 2006 13:05:50 +0000
Subject: [PATCH] fix bad uses of installer argument

svn: r2939
---
 collects/mysterx/installer.ss | 5 +++--
 collects/mzcom/installer.ss   | 7 ++++---
 collects/sgl/makefile.ss      | 3 ++-
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/collects/mysterx/installer.ss b/collects/mysterx/installer.ss
index 84032c8928..76cb13740a 100644
--- a/collects/mysterx/installer.ss
+++ b/collects/mysterx/installer.ss
@@ -1,9 +1,10 @@
 (module installer mzscheme
-  (require (lib "process.ss"))
+  (require (lib "process.ss")
+	   (lib "dirs.ss" "setup"))
   (provide post-installer)
   (define (post-installer plt-home)
     (define (make-dll-path . more)
-      (apply build-path plt-home "lib" more))
+      (apply build-path (find-dll-dir) more))
     (define (warn fmt . args) (apply fprintf (current-error-port) fmt args))
     (let* ([dlls '("myspage.dll" "myssink.dll")]
            [dll-paths (map make-dll-path dlls)]
diff --git a/collects/mzcom/installer.ss b/collects/mzcom/installer.ss
index 9cf90b93dd..7cba51ebbb 100644
--- a/collects/mzcom/installer.ss
+++ b/collects/mzcom/installer.ss
@@ -1,11 +1,12 @@
 (module installer mzscheme
-  (require (lib "process.ss"))
+  (require (lib "process.ss")
+	   (lib "dirs.ss" "setup"))
   (provide post-installer)
   (define (post-installer plt-home)
     (let ([exe "MzCOM.exe"])
       (cond [(not (eq? (system-type) 'windows))
              (printf "Warning: can't install MzCOM on non-Windows machine\n")]
-            [(not (file-exists? (build-path plt-home exe)))
+            [(not (file-exists? (build-path (find-console-bin-dir) exe)))
              (printf "Warning: MzCOM binary not installed\n")]
-            [else (parameterize ([current-directory plt-home])
+            [else (parameterize ([current-directory (find-console-bin-dir)])
                     (system* exe "/RegServer"))]))))
diff --git a/collects/sgl/makefile.ss b/collects/sgl/makefile.ss
index 7a4720f735..4e70591c90 100644
--- a/collects/sgl/makefile.ss
+++ b/collects/sgl/makefile.ss
@@ -1,5 +1,6 @@
 (module makefile mzscheme
   (require (lib "make.ss" "make")
+	   (lib "dirs.ss" "setup")
            "make-gl-info.ss")
 
   (provide pre-installer)
@@ -12,6 +13,6 @@
 		   (make-print-checking #f))
       (make/proc
        `((,(build-path dir "gl-info.zo")
-           ("make-gl-info.ss" ,(build-path home "include" "schvers.h"))
+           ("make-gl-info.ss" ,(build-path (find-include-dir) "schvers.h"))
            ,(lambda () (make-gl-info dir home)))))))
   )