From c67f505a710c594c36974d23b3223a95aabd9c8f Mon Sep 17 00:00:00 2001
From: Simon John <git@the-jedi.co.uk>
Date: Mon, 28 Dec 2015 10:05:53 +0000
Subject: Removed the check for BOOTLOADER_PATH being empty as its merged into
 BOOTLOADER_FILE in 1.5+

Now we just check for BOOTLOADER_FILE being non-empty on both versions.

Fixes issue #402
---
 Arduino.mk | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'Arduino.mk')

diff --git a/Arduino.mk b/Arduino.mk
index 1ba6c6e..ab7ecd9 100644
--- a/Arduino.mk
+++ b/Arduino.mk
@@ -1358,10 +1358,8 @@ endif
 
 # Bootloader file settings
 ifndef AVRDUDE_ISP_BURN_BOOTLOADER
-    ifneq ($(strip $(BOOTLOADER_PATH)),)
-        ifneq ($(strip $(BOOTLOADER_FILE)),)
-            AVRDUDE_ISP_BURN_BOOTLOADER += -U flash:w:$(BOOTLOADER_PARENT)/$(BOOTLOADER_PATH)/$(BOOTLOADER_FILE):i
-        endif
+    ifneq ($(strip $(BOOTLOADER_FILE)),)
+        AVRDUDE_ISP_BURN_BOOTLOADER += -U flash:w:$(BOOTLOADER_PARENT)/$(BOOTLOADER_PATH)/$(BOOTLOADER_FILE):i
     endif
 endif
 
-- 
cgit v1.2.3