>From d234d179149254dfe3d04804cc7527873b7b14da Mon Sep 17 00:00:00 2001 From: Mario Domenech Goulart Date: Thu, 20 Feb 2014 21:57:05 -0300 Subject: [PATCH] Quote $(MAKE) invocations Unquoted $(MAKE) seems to cause problems on Windows (cmd.exe) when the path to `make' contains spaces. --- GNUmakefile | 8 ++++---- rules.make | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/GNUmakefile b/GNUmakefile index bdeb301..9714a25 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -36,7 +36,7 @@ endif ifndef PLATFORM $(info Please select your target platform by running one of the following commands:) $(info ) -$(foreach mf, $(wildcard Makefile.*), $(info $(MAKE) PLATFORM=$(mf:Makefile.%=%))) +$(foreach mf, $(wildcard Makefile.*), $(info "$(MAKE)" PLATFORM=$(mf:Makefile.%=%))) $(info ) $(info For more information, consult the README file.) $(error No PLATFORM given.) @@ -51,10 +51,10 @@ STANDARD_TARGETS \ .PHONY: $(STANDARD_TARGETS) dist boot-chicken $(STANDARD_TARGETS): - $(MAKE) -f $(SRCDIR)/Makefile.$(PLATFORM) CONFIG=$(CONFIG) $@ + "$(MAKE)" -f $(SRCDIR)/Makefile.$(PLATFORM) CONFIG=$(CONFIG) $@ dist: - $(MAKE) -f $(SRCDIR)/Makefile.$(PLATFORM) CONFIG=$(CONFIG) dist + "$(MAKE)" -f $(SRCDIR)/Makefile.$(PLATFORM) CONFIG=$(CONFIG) dist boot-chicken: - $(MAKE) -f $(SRCDIR)/Makefile.$(PLATFORM) boot-chicken + "$(MAKE)" -f $(SRCDIR)/Makefile.$(PLATFORM) boot-chicken diff --git a/rules.make b/rules.make index 48e41d9..cf8da06 100644 --- a/rules.make +++ b/rules.make @@ -350,7 +350,7 @@ install-bin: $(REMOVE_COMMAND) $(REMOVE_COMMAND_OPTIONS) $(IMPORT_LIBRARIES:%=%.so) $(REMOVE_COMMAND) $(REMOVE_COMMAND_OPTIONS) $(IMPORT_LIBRARIES:%=%.import.so) $(REMOVE_COMMAND) $(REMOVE_COMMAND_OPTIONS) $(LIBCHICKEN_SO_FILE) - $(MAKE) -f $(SRCDIR)Makefile.$(PLATFORM) CONFIG=$(CONFIG) NEEDS_RELINKING=no RUNTIME_LINKER_PATH="$(LIBDIR)" install-bin + "$(MAKE)" -f $(SRCDIR)Makefile.$(PLATFORM) CONFIG=$(CONFIG) NEEDS_RELINKING=no RUNTIME_LINKER_PATH="$(LIBDIR)" install-bin # Damn. What was this for, again? # # $(MAKE_WRITABLE_COMMAND) $(CHICKEN_PROGRAM)$(EXE) $(CSI_PROGRAM)$(EXE) $(CSC_PROGRAM)$(EXE) $(CHICKEN_PROFILE_PROGRAM)$(EXE) @@ -673,11 +673,11 @@ bench: $(CHICKEN_SHARED_EXECUTABLE) $(CSI_SHARED_EXECUTABLE) $(CSC_PROGRAM)$(EXE .PHONY: boot-chicken boot-chicken: - $(MAKE) -f Makefile.$(PLATFORM) PLATFORM=$(PLATFORM) PREFIX=/nowhere CONFIG= \ + "$(MAKE)" -f Makefile.$(PLATFORM) PLATFORM=$(PLATFORM) PREFIX=/nowhere CONFIG= \ CHICKEN=$(CHICKEN) PROGRAM_SUFFIX=-boot-stage1 STATICBUILD=1 \ C_COMPILER_OPTIMIZATION_OPTIONS="$(C_COMPILER_OPTIMIZATION_OPTIONS)" C_HACKED_APPLY= BUILDING_CHICKEN_BOOT=1 \ confclean chicken-boot-stage1$(EXE) - $(MAKE) -f Makefile.$(PLATFORM) PLATFORM=$(PLATFORM) PREFIX=/nowhere CONFIG= \ + "$(MAKE)" -f Makefile.$(PLATFORM) PLATFORM=$(PLATFORM) PREFIX=/nowhere CONFIG= \ CHICKEN=.$(SEP)chicken-boot-stage1$(EXE) PROGRAM_SUFFIX=-boot \ STATICBUILD=1 C_COMPILER_OPTIMIZATION_OPTIONS="$(C_COMPILER_OPTIMIZATION_OPTIONS)" \ touchfiles chicken-boot$(EXE) confclean -- 1.7.10.4