From a68887ce2d36f4314530fe9fdd25cf157297d940 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Thu, 28 Sep 2017 22:31:20 +0200
Subject: [PATCH] FIX: #402 https://github.com/Proxmark/proxmark3/pull/402 
 (piwi)

---
 client/Makefile      | 10 ++++++----
 tools/mfkey/Makefile |  4 ++--
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/client/Makefile b/client/Makefile
index b5b853e8d..451bbaedc 100644
--- a/client/Makefile
+++ b/client/Makefile
@@ -12,17 +12,19 @@ TARFLAGS = -C .. --ignore-failed-read -rvf
 RM = rm -f
 MV = mv
 
-#COMMON_FLAGS = -m32
 # uncomment to enable EMV
-#COMMON_FLAGS += -DWITH_EMV
+#CFLAGS += -DWITH_EMV
+
+ENV_LDFLAGS := $(LDFLAGS)
+ENV_CFLAGS := $(CFLAGS)
 
 VPATH = ../common ../zlib ../uart
 OBJDIR = obj
 
 LDLIBS = -L/opt/local/lib -L/usr/local/lib -lreadline -lpthread -lm
 LUALIB = ../liblua/liblua.a
-LDFLAGS = $(COMMON_FLAGS)
-CFLAGS = -std=c99 -D_ISOC99_SOURCE -I. -I../include -I../common -I../zlib -I../uart -I/opt/local/include -I../liblua -Wall $(COMMON_FLAGS) -g -O3
+LDFLAGS = $(ENV_LDFLAGS)
+CFLAGS = $(ENV_CFLAGS) -std=c99 -D_ISOC99_SOURCE -I. -I../include -I../common -I../zlib -I../uart -I/opt/local/include -I../liblua -Wall -g -O3
 CXXFLAGS = -I../include -Wall -O3
 
 LUAPLATFORM = generic
diff --git a/tools/mfkey/Makefile b/tools/mfkey/Makefile
index 6a4c541fd..98f52d696 100755
--- a/tools/mfkey/Makefile
+++ b/tools/mfkey/Makefile
@@ -1,7 +1,7 @@
 CC = gcc
 LD = gcc
-CFLAGS =  -std=c99 -march=native -Wall -Winline -O3
-LDFLAGS =
+CFLAGS +=  -std=c99 -march=native -Wall -Winline -O3
+LDFLAGS +=
 
 OBJS = crapto1.o crypto1.o
 HEADERS = crapto1.h