From edd74d6ecffbc1e265357eb9d9f5038e288ae30c Mon Sep 17 00:00:00 2001
From: Matthew Flatt <mflatt@racket-lang.org>
Date: Wed, 5 Jun 2019 06:43:28 -0600
Subject: [PATCH] makefile: configure with `--enable-racket` => no 3m
 dependency CS

Adjust the makefile that ends up in <builddir> with `--enable-cs` or
`--enable-csdefault` (as opposed to `--enable-csonly`) so that `make
racketcs` doesn't imply `make racket3m` if `--enable-racket` has
supplied an existing Racket.

Also fix `make install-cs` related to GRacket for the case that Racket
3m/CGC isn't built.

Relevant to #2683
---
 racket/src/Makefile.in         | 6 ++++--
 racket/src/cfg-racket          | 7 ++++++-
 racket/src/racket/configure.ac | 7 ++++++-
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/racket/src/Makefile.in b/racket/src/Makefile.in
index 326e1a38cf..405bfa1e7c 100644
--- a/racket/src/Makefile.in
+++ b/racket/src/Makefile.in
@@ -134,9 +134,11 @@ install-common-first:
         esac
 	mkdir -p $(ALLDIRINFO)
 
+MIDDLE_POST_COLLECTS = install-@MAKE_GRACKET@-post-collects
+
 install-common-middle:
 	$(MAKE) @MAKE_COPYTREE@-run
-	$(MAKE) install-@MAKE_GRACKET@-post-collects
+	$(MAKE) $(MIDDLE_POST_COLLECTS)
 	$(MAKE) lib-finish
 
 install-common-last:
@@ -259,7 +261,7 @@ CS_SETUP_INSTALL_TARGET = setup-install
 install-cs-common:
 	$(MAKE) install-common-first
 	cd cs/c; $(MAKE) plain-install
-	$(MAKE) install-common-middle
+	$(MAKE) install-common-middle MIDDLE_POST_COLLECTS=install-no-post-collects
 	cd cs/c; $(MAKE) $(CS_SETUP_INSTALL_TARGET)
 	$(MAKE) install-common-last
 
diff --git a/racket/src/cfg-racket b/racket/src/cfg-racket
index 204ff59a7a..ad8cb8eea9 100755
--- a/racket/src/cfg-racket
+++ b/racket/src/cfg-racket
@@ -5054,7 +5054,12 @@ if test "${enable_cgcdefault}" ; then
    MAIN_VARIANT=cgc
 fi
 MAIN_MAKE_TARGET="${MAIN_VARIANT}"
-CS_BOOTSTRAP_HELP="${MAIN_VARIANT}"
+
+if test "${enable_racket}" = "" ; then
+  CS_BOOTSTRAP_HELP="${MAIN_VARIANT}"
+else
+  CS_BOOTSTRAP_HELP="no-${MAIN_VARIANT}"
+fi
 
 if test "${enable_csdefault}" ; then
    MMM_INSTALLED=3m
diff --git a/racket/src/racket/configure.ac b/racket/src/racket/configure.ac
index fca7944147..2c021eb2b9 100644
--- a/racket/src/racket/configure.ac
+++ b/racket/src/racket/configure.ac
@@ -769,7 +769,12 @@ if test "${enable_cgcdefault}" ; then
    MAIN_VARIANT=cgc
 fi
 MAIN_MAKE_TARGET="${MAIN_VARIANT}"
-CS_BOOTSTRAP_HELP="${MAIN_VARIANT}"
+
+if test "${enable_racket}" = "" ; then
+  CS_BOOTSTRAP_HELP="${MAIN_VARIANT}"
+else
+  CS_BOOTSTRAP_HELP="no-${MAIN_VARIANT}"
+fi
 
 if test "${enable_csdefault}" ; then
    MMM_INSTALLED=3m