From 1cc901e14edf099b86fb3bb6045bf66c98f7b23b Mon Sep 17 00:00:00 2001
From: felix <felix@call-with-current-continuation.org>
Date: Tue, 7 Sep 2021 10:12:36 +0200
Subject: [PATCH] Ensure platform identifier is used when determining install
 command for files on windows. Previously the defaults from chicken-config.h
 where used, but depending on the shell used during installation, this may be
 a UNIX command if the MSYS shell was used.

Thanks to Mark Fisher for his tremendous help in fixing this bug.
---
 egg-compile.scm         | 21 ++++++++++++++++-----
 manual/Acknowledgements |  2 +-
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/egg-compile.scm b/egg-compile.scm
index 205505a6..0c49968f 100644
--- a/egg-compile.scm
+++ b/egg-compile.scm
@@ -80,18 +80,29 @@
     ((unix) "cp -r")
     ((windows) "xcopy /y /i /e")))
 
+(define (copy-file-command platform)
+  (case platform
+    ((unix) "cp")
+    ((windows) "copy /y")))
+
 (define (mkdir-command platform)
   (case platform
     ((unix) "mkdir -p")
     ((windows) "mkdir")))
 
 (define (install-executable-command platform)
-  (string-append default-install-program " "
-		 default-install-program-executable-flags))
-
+  (case platform
+    ((windows) (copy-file-command 'windows))
+     (else
+       (string-append default-install-program " "
+     		     d default-install-program-executable-flags))))
+ 
 (define (install-file-command platform)
-  (string-append default-install-program " "
-		 default-install-program-data-flags))
+  (case platform
+    ((windows) (copy-file-command 'windows))
+     (else
+       (string-append default-install-program " "
+   	      	      default-install-program-data-flags))))
 
 (define (remove-file-command platform)
   (case platform
diff --git a/manual/Acknowledgements b/manual/Acknowledgements
index 0489a0eb..fcaaa92f 100644
--- a/manual/Acknowledgements
+++ b/manual/Acknowledgements
@@ -17,7 +17,7 @@ Forero Cuervo, Peter Danenberg, Linh Dang, Brian Denheyer, Sean
 D'Epagnier, "dgym", "Don", Chris Double, "Brown Dragon", David
 Dreisigmeyer, Jarod Eells, Petter Egesund, Stephen Eilert, Steve
 Elkins, Daniel B. Faken, Erik Falor, Will Farr, Graham Fawcett, Marc
-Feeley, "Fizzie", Matthew Flatt, Kimura Fuyuki, Tony Garnock-Jones,
+Feeley, Mark Fisher, "Fizzie", Matthew Flatt, Kimura Fuyuki, Tony Garnock-Jones,
 Martin Gasbichler, Abdulaziz Ghuloum, Joey Gibson, Stephen C. Gilardi,
 Mario Domenech Goulart, Joshua Griffith, Johannes Groedem, Damian
 Gryski, Matt Gushee, Andreas Gustafsson, Sven Hartrumpf, Jun-ichiro
-- 
2.26.2