>From b4f1f0e65b77cd36035a65d35245e780d60f1293 Mon Sep 17 00:00:00 2001
From: Mario Domenech Goulart <address@hidden>
Date: Sun, 28 May 2017 18:15:38 +0200
Subject: [PATCH] egg stuff: respect CHICKEN_INSTALL_BINDIR when installing
 executables

---
 egg-compile.scm     | 6 ++----
 egg-environment.scm | 6 ++++++
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/egg-compile.scm b/egg-compile.scm
index 4d7332c..a37ced6 100644
--- a/egg-compile.scm
+++ b/egg-compile.scm
@@ -233,9 +233,7 @@
                       (oname #f)
                       (opts '()))
             (for-each compile-extension/program (cddr info))
-            (let ((dest (if (eq? mode 'target) 
-                            default-bindir   ; XXX wrong!
-                            host-bindir)))
+            (let ((dest (install-bindir mode)))
               (addfiles (list (conc dest "/" target exeext))))
             (set! prgs 
               (cons (list target dependencies: deps source: src options: opts 
@@ -602,7 +600,7 @@
          (ext (executable-extension platform))
          (sname (prefix srcdir name))
          (out (quotearg (target-file (conc sname ext) mode)))
-         (dest (if (eq? mode 'target) default-bindir host-bindir))
+         (dest (install-bindir mode))
          (dfile (quotearg (slashify dest platform)))
          (ddir (shell-variable "DESTDIR" platform))
          (destf (quotearg (slashify (conc dest "/" output-file ext) 
diff --git a/egg-environment.scm b/egg-environment.scm
index ca7e201..d599484 100644
--- a/egg-environment.scm
+++ b/egg-environment.scm
@@ -98,3 +98,9 @@ EOF
       (if run target-run-repo target-repo)
       (or (get-environment-variable "CHICKEN_INSTALL_REPOSITORY")
           host-repo)))
+
+(define (install-bindir mode)
+  (or (get-environment-variable "CHICKEN_INSTALL_BINDIR")
+      (if (eq? mode 'target)
+	  default-bindir  ;; XXX wrong!
+	  host-bindir)))
-- 
2.1.4