From ae83f35241b4ce087e1677dedfef2e8378db3bec Mon Sep 17 00:00:00 2001
From: Stefan Rupp <struppi@struppi.name>
Date: Sat, 8 Mar 2014 23:52:30 +0100
Subject: [PATCH] fix stuff after merge

---
 Makefile | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index d2adcc3..046ab1e 100644
--- a/Makefile
+++ b/Makefile
@@ -44,12 +44,10 @@ bin:  $(PRG).bin
 
 %.hex: %.elf
 	$(OBJCOPY) -j .text -j .data -O ihex $< $@
-%.bin: %.elf
-	$(OBJCOPY) -j .text -j .data -O binary $< $@
 
 %.bin: %.elf
 	$(OBJCOPY) -j .text -j .data -O binary $< $@
 
-prg: $(PRG).hex
-	python2 ../megaHidProg -C -c 1000 -t 4 -b $(PRG).bin 
+prg: $(PRG).bin
+	python2 ../megaHidProg/megaHidProg.py -C -c 1000 -t 4 -b $(PRG).bin