From: pwpiwi <pwpiwi@users.noreply.github.com>
Date: Mon, 25 Sep 2017 16:31:10 +0000 (+0200)
Subject: Don't ignore environment variables CFLAGS and LDFLAGS
X-Git-Tag: v3.1.0~165^2~1
X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/f53eb07de0312bde80ba46f0b7dc79c51bcb85f2?hp=3a05a1e73940bfa13ce5f732fd5d14ee333c6977

Don't ignore environment variables CFLAGS and LDFLAGS
* they are be set by some build environments to find include and lib dirs
---

diff --git a/client/Makefile b/client/Makefile
index fd2ae290..3a96e9e9 100644
--- a/client/Makefile
+++ b/client/Makefile
@@ -12,14 +12,15 @@ TARFLAGS = -C .. --ignore-failed-read -rvf
 RM = rm -f
 MV = mv
 
-#COMMON_FLAGS = -m32
+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