From e0a9a92c0f9f8f3a2a66fa38d9786f7ccdf6fbd9 Mon Sep 17 00:00:00 2001 From: Sam Tobin-Hochstadt Date: Tue, 2 Dec 2014 14:30:01 -0500 Subject: [PATCH] Makefile change --- Makefile | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 2f5e37c2ec..e0fff39c1f 100644 --- a/Makefile +++ b/Makefile @@ -21,7 +21,8 @@ # Packages (separated by spaces) to link in development mode or # to include in a distribution: -PKGS = main-distribution plt-services +PKGS = base racket-lib # plt-services +INSTALL_PKGS = main-distribution main-distribution-test # ------------------------------------------------------------ # In-place build @@ -29,6 +30,10 @@ PKGS = main-distribution plt-services PLAIN_RACKET = racket/bin/racket WIN32_PLAIN_RACKET = racket\racket +PLAIN_RACO = racket/bin/racket -N raco -l- raco +WIN32_PLAIN_RACO = racket\racket -N raco -l- raco + + MACOSX_CHECK_ARGS = -I racket/base -e '(case (system-type) [(macosx) (exit 0)] [else (exit 1)])' MACOSX_CHECK = $(PLAIN_RACKET) -G build/config $(MACOSX_CHECK_ARGS) @@ -53,6 +58,8 @@ plain-in-place: if $(MACOSX_CHECK) ; then $(MAKE) native-from-git ; fi $(MAKE) pkg-links $(PKG_LINK_COPY_ARGS) $(PLAIN_RACKET) $(LIBSETUP) $(JOB_OPTIONS) $(PLT_SETUP_OPTIONS) + $(PLAIN_RACO) pkg install $(JOB_OPTIONS) --scope installation \ + --dep search-auto $(INSTALL_PKGS) # For Windows: set up the following collections first, so that native # libraries are in place for use by a full setup: @@ -63,6 +70,8 @@ win32-in-place: $(MAKE) win32-pkg-links $(PKG_LINK_COPY_ARGS) $(WIN32_PLAIN_RACKET) $(LIBSETUP) -nxiID $(JOB_OPTIONS) $(PLT_SETUP_OPTIONS) $(LIB_PRE_COLLECTS) $(WIN32_PLAIN_RACKET) $(LIBSETUP) $(JOB_OPTIONS) $(PLT_SETUP_OPTIONS) + $(WIN32_PLAIN_RACO) pkg install $(JOB_OPTIONS) --scope installation \ + --dep search-auto $(INSTALL_PKGS) again: $(MAKE) LINK_MODE="--restore" @@ -96,6 +105,7 @@ plain-unix-style: $(MAKE) local-catalog-maybe-native RACKET="$(DESTDIR)$(PREFIX)/bin/racket" "$(DESTDIR)$(PREFIX)/bin/raco" pkg install $(UNIX_RACO_ARGS) $(REQUIRED_PKGS) $(PKGS) cd racket/src/build; $(MAKE) fix-paths + "$(DESTDIR)$(PREFIX)/bin/raco" pkg install $(JOB_OPTIONS) -i --dep search-auto $(INSTALL_PKGS) error-need-prefix: : ================================================================