From 17aa63e907eb707f1dd309c9bdef496de7820de8 Mon Sep 17 00:00:00 2001 From: Steven Smith Date: Wed, 27 Jan 2016 21:02:50 -0800 Subject: [PATCH] Fix zip build when EXTRA_OUTPUT_FILES is empty. --- make_base | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/make_base b/make_base index beeab13..ad37e40 100644 --- a/make_base +++ b/make_base @@ -130,6 +130,10 @@ ifeq ($(TARGET),3DS) endif endif +ifneq ($(EXTRA_OUTPUT_FILES),) + EXTRA_OUTPUT_COPY_CMD := cp -r $(EXTRA_OUTPUT_FILES) $(OUTPUT_DIR) +endif + # RULES # .PHONY: all run install clean @@ -174,7 +178,7 @@ $(foreach file,$(OUTPUT_FILES),$(eval $(call createdirrule,$(file)))) $(OUTPUT_ZIP_FILE): $(OUTPUT_FILES) $(EXTRA_OUTPUT_FILES) @echo $@ - @cp -r $(EXTRA_OUTPUT_FILES) $(OUTPUT_DIR) + @$(EXTRA_OUTPUT_COPY_CMD) @cd $(OUTPUT_DIR); \ zip -r $(patsubst $(OUTPUT_DIR)/%,%,$@ $^) > /dev/null