From d07bd11495eb16729c5aaf26e90ce531df0f590e Mon Sep 17 00:00:00 2001
From: Matthew Flatt <mflatt@racket-lang.org>
Date: Fri, 25 Oct 2013 15:58:53 -0600
Subject: [PATCH] Makefile: make PLT_SETUP_ARGS work more sensibly

Make sure it's at the end of the `raco setup` command line, and set
the executable name to "raco" instead of "raco setup" so that the `-l`
flag is effectively implied.
---
 racket/src/Makefile.in      | 2 +-
 racket/src/worksp/build.bat | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/racket/src/Makefile.in b/racket/src/Makefile.in
index af8ccbc93f..4f45ff0b21 100644
--- a/racket/src/Makefile.in
+++ b/racket/src/Makefile.in
@@ -77,7 +77,7 @@ both:
 # Install (common) ----------------------------------------
 
 INST_CONFIG = -X @DIRCVTPRE@"$(DESTDIR)$(collectsdir)"@DIRCVTPOST@ -G @DIRCVTPRE@"$(DESTDIR)$(configdir)"@DIRCVTPOST@
-SETUP_ARGS = $(INST_CONFIG) $(SELF_RACKET_FLAGS) -N "raco setup" -l- setup $(PLT_SETUP_OPTIONS) $(PLT_ISO) @INSTALL_SETUP_FLAGS@
+SETUP_ARGS = $(INST_CONFIG) $(SELF_RACKET_FLAGS) -N "raco" -l- setup @INSTALL_SETUP_FLAGS@ $(PLT_SETUP_OPTIONS) $(PLT_ISO)
 
 # Pass compile and link flags to `make install' for use by any
 #  collection-setup actions that compile and link C code:
diff --git a/racket/src/worksp/build.bat b/racket/src/worksp/build.bat
index 0229072bac..f236b7f850 100644
--- a/racket/src/worksp/build.bat
+++ b/racket/src/worksp/build.bat
@@ -57,5 +57,5 @@ if errorlevel 1 exit /B 1
 copy ..\COPYING.txt ..\..\share\
 if errorlevel 1 exit /B 1
 
-..\..\racket -G %BUILD_CONFIG% -N "raco setup" %SELF_RACKET_FLAGS% -l- setup %PLT_SETUP_OPTIONS%
+..\..\racket -G %BUILD_CONFIG% -N "raco" %SELF_RACKET_FLAGS% -l- setup %PLT_SETUP_OPTIONS%
 if errorlevel 1 exit /B 1