From 1407e0cc9f156462fe34193c4b0ed30ac068f1a1 Mon Sep 17 00:00:00 2001
From: Matthew Flatt <mflatt@racket-lang.org>
Date: Mon, 16 Jun 2014 11:10:28 +0100
Subject: [PATCH] win32-in-place: fix prep of libraries needed by `raco setup`

---
 Makefile | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 247905b5a4..f61ebd24ff 100644
--- a/Makefile
+++ b/Makefile
@@ -54,10 +54,14 @@ plain-in-place:
 	$(MAKE) pkg-links $(PKG_LINK_COPY_ARGS)
 	$(PLAIN_RACKET) $(LIBSETUP) $(JOB_OPTIONS) $(PLT_SETUP_OPTIONS)
 
+# For Windows: set up the following collections first, so that native
+# libraries are in place for use by a full setup:
+LIB_PRE_COLLECTS = racket db com
+
 win32-in-place:
 	$(MAKE) win32-base
 	$(MAKE) win32-pkg-links $(PKG_LINK_COPY_ARGS)
-	$(WIN32_PLAIN_RACKET) $(LIBSETUP) -nxiID $(JOB_OPTIONS) $(PLT_SETUP_OPTIONS) racket
+	$(WIN32_PLAIN_RACKET) $(LIBSETUP) -nxiID $(JOB_OPTIONS) $(PLT_SETUP_OPTIONS) $(LIB_PRE_COLLECTS)
 	$(WIN32_PLAIN_RACKET) $(LIBSETUP) $(JOB_OPTIONS) $(PLT_SETUP_OPTIONS)
 
 again: